summaryrefslogtreecommitdiff
path: root/navit/graphics/gd/graphics_gd.c
diff options
context:
space:
mode:
Diffstat (limited to 'navit/graphics/gd/graphics_gd.c')
-rw-r--r--navit/graphics/gd/graphics_gd.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/navit/graphics/gd/graphics_gd.c b/navit/graphics/gd/graphics_gd.c
index 3ef6c520b..c2d09ae46 100644
--- a/navit/graphics/gd/graphics_gd.c
+++ b/navit/graphics/gd/graphics_gd.c
@@ -511,7 +511,7 @@ draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
if (gr->flags & 2) {
struct shmem_header *next=shm_next(gr);
gr->shm_header->flag=1;
- dbg(lvl_debug,"next flag is %d\n",next->flag);
+ dbg(lvl_debug,"next flag is %d",next->flag);
if (!next->flag) {
gr->shm_header=next;
image_setup(gr);
@@ -526,15 +526,15 @@ draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
while (sockets) {
int fd=socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
- dbg(lvl_error,"socket failed\n");
+ dbg(lvl_error,"socket failed");
} else {
if (connect(fd, (struct sockaddr *)sockets->data, sizeof(struct sockaddr_in)) < 0) {
- dbg(lvl_error,"connect failed\n");
+ dbg(lvl_error,"connect failed");
} else {
size_written=write(fd, data, size);
- dbg(lvl_debug,"size %d vs %d\n",size, size_written);
+ dbg(lvl_debug,"size %d vs %d",size, size_written);
if (shutdown(fd, SHUT_RDWR) < 0)
- dbg(lvl_error,"shutdown failed\n");
+ dbg(lvl_error,"shutdown failed");
}
close(fd);
}
@@ -586,7 +586,7 @@ get_data(struct graphics_priv *this, char *type)
int b;
struct point p;
gdImagePtr im = this->im;
- dbg(lvl_debug,"type=%s\n",type);
+ dbg(lvl_debug,"type=%s",type);
if (!strcmp(type,"window"))
return &this->window;
if (!strcmp(type,"image_png")) {
@@ -608,11 +608,11 @@ get_data(struct graphics_priv *this, char *type)
return &this->image;
}
if (sscanf(type,"click_%d_%d_%d",&p.x,&p.y,&b) == 3) {
- dbg(lvl_debug,"click %d %d %d\n",p.x,p.y,b);
+ dbg(lvl_debug,"click %d %d %d",p.x,p.y,b);
callback_list_call_attr_3(this->cbl, attr_button, (void *)b, (void *)1, (void *)&p);
}
if (sscanf(type,"move_%d_%d",&p.x,&p.y) == 2) {
- dbg(lvl_debug,"move %d %d\n",p.x,p.y);
+ dbg(lvl_debug,"move %d %d",p.x,p.y);
callback_list_call_attr_1(this->cbl, attr_motion, (void *)&p);
}
return NULL;
@@ -629,13 +629,13 @@ image_free(struct graphics_priv *gr, struct graphics_image_priv *priv)
static void
overlay_disable(struct graphics_priv *gr, int disable)
{
- dbg(lvl_debug,"enter\n");
+ dbg(lvl_debug,"enter");
}
static void
overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int wraparound)
{
- dbg(lvl_debug,"enter\n");
+ dbg(lvl_debug,"enter");
}
struct shmem_header *
@@ -643,10 +643,10 @@ shm_next(struct graphics_priv *gr)
{
char *next=(char *)gr->shm_header+gr->shmoffset;
if (next+gr->shmoffset > (char *)gr->shm+gr->shmsize) {
- dbg(lvl_debug,"wraparound\n");
+ dbg(lvl_debug,"wraparound");
return gr->shm;
}
- dbg(lvl_debug,"next 0x%x (offset 0x%x)\n",next-(char *)gr->shm,gr->shmoffset);
+ dbg(lvl_debug,"next 0x%x (offset 0x%x)",next-(char *)gr->shm,gr->shmoffset);
return (struct shmem_header *)next;
}
@@ -667,17 +667,17 @@ image_setup(struct graphics_priv *gr)
static void
image_create(struct graphics_priv *gr)
{
- dbg(lvl_debug,"shmkey %d\n",gr->shmkey);
+ dbg(lvl_debug,"shmkey %d",gr->shmkey);
#ifdef HAVE_SHMEM
if (gr->shmkey) {
int size=gr->h*gr->w*sizeof(int);
int shmid=shmget(gr->shmkey, size, 0666);
- dbg(lvl_debug,"shmid for key 0x%x is 0x%x\n",gr->shmkey, shmid);
+ dbg(lvl_debug,"shmid for key 0x%x is 0x%x",gr->shmkey, shmid);
if (shmid < 0)
- dbg(lvl_debug,"shmget\n");
+ dbg(lvl_debug,"shmget");
gr->shm=shmat(shmid, NULL, 0);
if (!gr->shm)
- dbg(lvl_debug,"shmat\n");
+ dbg(lvl_debug,"shmat");
gr->shm_header=gr->shm;
gr->im=g_new0(gdImage,1);
gr->im->tpixels=g_new(int *,gr->h);
@@ -754,7 +754,7 @@ set_attr_do(struct graphics_priv *gr, struct attr *attr, int init)
g_list_free(gr->sockets);
gr->sockets=NULL;
c=s=g_strdup(attr->u.str);
- dbg(lvl_debug,"s=%s\n",s);
+ dbg(lvl_debug,"s=%s",s);
while (c) {
n=strchr(c,',');
if (n)
@@ -768,12 +768,12 @@ set_attr_do(struct graphics_priv *gr, struct attr *attr, int init)
if (inet_aton(c, &sin->sin_addr)) {
gr->sockets=g_list_append(gr->sockets, sin);
} else {
- dbg(lvl_error,"error in %s\n",c);
+ dbg(lvl_error,"error in %s",c);
g_free(sin);
}
- dbg(lvl_debug,"host=%s port=%s\n",c,p);
+ dbg(lvl_debug,"host=%s port=%s",c,p);
} else
- dbg(lvl_error,"error in format: %s\n",p);
+ dbg(lvl_error,"error in format: %s",p);
c=n;
}
g_free(s);
@@ -823,7 +823,7 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
struct font_priv * (*font_freetype_new)(void *meth);
struct graphics_priv *ret;
- dbg(lvl_debug,"enter\n");
+ dbg(lvl_debug,"enter");
ret=g_new0(struct graphics_priv, 1);
*meth=graphics_methods;
font_freetype_new=plugin_get_category_font("freetype");