diff options
Diffstat (limited to 'navit/file.c')
| -rw-r--r-- | navit/file.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/navit/file.c b/navit/file.c index 8363b6a8b..393c54642 100644 --- a/navit/file.c +++ b/navit/file.c @@ -83,7 +83,7 @@ file_socket_connect(char *host, char *service) hints.ai_protocol = 0; s = getaddrinfo(host, service, &hints, &result); if (s != 0) { - dbg(lvl_error,"getaddrinfo error %s\n",gai_strerror(s)); + dbg(lvl_error,"getaddrinfo error %s",gai_strerror(s)); return -1; } for (rp = result; rp != NULL; rp = rp->ai_next) { @@ -104,7 +104,7 @@ file_http_request(struct file *file, char *method, char *host, char *path, char { char *request=g_strdup_printf("%s %s HTTP/1.0\r\nUser-Agent: navit %s\r\nHost: %s\r\n%s%s%s\r\n",method,path,version,host,persistent?"Connection: Keep-Alive\r\n":"",header?header:"",header?"\r\n":""); write(file->fd, request, strlen(request)); - dbg(lvl_debug,"%s\n",request); + dbg(lvl_debug,"%s",request); file->requests++; } @@ -141,7 +141,7 @@ file_request_do(struct file *file, struct attr **options, int connect) host[path-name-7]='\0'; if (port) *port++='\0'; - dbg(lvl_debug,"host=%s path=%s\n",host,path); + dbg(lvl_debug,"host=%s path=%s",host,path); if (connect) file->fd=file_socket_connect(host,port?port:"80"); file_http_request(file,method,host,path,header,persistent); @@ -215,11 +215,11 @@ file_create(char *name, struct attr **options) g_free(file); return NULL; } - dbg(lvl_debug,"fd=%d\n", file->fd); + dbg(lvl_debug,"fd=%d", file->fd); file->size=lseek(file->fd, 0, SEEK_END); if (file->size < 0) file->size=0; - dbg(lvl_debug,"size="LONGLONG_FMT"\n", file->size); + dbg(lvl_debug,"size="LONGLONG_FMT"", file->size); file->name_id = (long)atom(name); } #ifdef CACHE_SIZE @@ -274,7 +274,7 @@ int file_mkdir(char *name, int pflag) char *buffer=g_alloca(sizeof(char)*(strlen(name)+1)); int ret; char *next; - dbg(lvl_debug,"enter %s %d\n",name,pflag); + dbg(lvl_debug,"enter %s %d",name,pflag); if (!pflag) { if (file_is_dir(name)) return 0; @@ -372,7 +372,7 @@ file_process_headers(struct file *file, unsigned char *headers) if (*sep == ' ') sep++; strtolower(tok, tok); - dbg(lvl_debug,"header '%s'='%s'\n",tok,sep); + dbg(lvl_debug,"header '%s'='%s'",tok,sep); g_hash_table_insert(file->headers, tok, sep); headers=NULL; } @@ -416,10 +416,10 @@ file_data_read_special(struct file *file, int size, int *size_ret) eof=1; } if (file->requests) { - dbg(lvl_debug,"checking header\n"); + dbg(lvl_debug,"checking header"); if ((hdr=file_http_header_end(file->buffer, file->buffer_len))) { hdr[-1]='\0'; - dbg(lvl_debug,"found %s\n",file->buffer); + dbg(lvl_debug,"found %s",file->buffer); file_process_headers(file, file->buffer); file_shift_buffer(file, hdr-file->buffer); file->requests--; @@ -453,7 +453,7 @@ file_data_flush(struct file *file, long long offset, int size) if (file->cache) { struct file_cache_id id={offset,size,file->name_id,0}; cache_flush(file_cache,&id); - dbg(lvl_debug,"Flushing "LONGLONG_FMT" %d bytes\n",offset,size); + dbg(lvl_debug,"Flushing "LONGLONG_FMT" %d bytes",offset,size); } } @@ -537,7 +537,7 @@ file_data_read_compressed(struct file *file, long long offset, int size, int siz ret=NULL; } else { if (uncompress_int(ret, &destLen, (Bytef *)buffer, size) != Z_OK) { - dbg(lvl_error,"uncompress failed\n"); + dbg(lvl_error,"uncompress failed"); g_free(ret); ret=NULL; } @@ -749,7 +749,7 @@ file_wordexp_new(const char *pattern) ret->pattern=g_strdup(pattern); ret->err=wordexp(pattern, &ret->we, 0); if (ret->err) - dbg(lvl_debug,"wordexp('%s') returned %d\n", pattern, ret->err); + dbg(lvl_debug,"wordexp('%s') returned %d", pattern, ret->err); return ret; } @@ -803,7 +803,7 @@ file_version(struct file *file, int mode) file->mtime=st.st_mtime; file->ctime=st.st_ctime; file->version++; - dbg(lvl_debug,"%s now version %d\n", file->name, file->version); + dbg(lvl_debug,"%s now version %d", file->name, file->version); } } return file->version; @@ -837,6 +837,6 @@ file_init(void) file_cache=cache_new(sizeof(struct file_cache_id), CACHE_SIZE); #endif if(sizeof(off_t)<8) - dbg(lvl_error,"Maps larger than 2GB are not supported by this binary, sizeof(off_t)=%zu\n",sizeof(off_t)); + dbg(lvl_error,"Maps larger than 2GB are not supported by this binary, sizeof(off_t)=%zu",sizeof(off_t)); } |