diff options
Diffstat (limited to 'navit/util.c')
| -rw-r--r-- | navit/util.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/navit/util.c b/navit/util.c index 1859d38b1..a51c804b5 100644 --- a/navit/util.c +++ b/navit/util.c @@ -62,7 +62,7 @@ navit_utf8_strcasecmp(const char *s1, const char *s2) s1_folded=g_utf8_casefold(s1,-1); s2_folded=g_utf8_casefold(s2,-1); cmpres=strcmp(s1_folded,s2_folded); - dbg(3,"Compared %s with %s, got %d\n",s1_folded,s2_folded,cmpres); + dbg(lvl_debug,"Compared %s with %s, got %d\n",s1_folded,s2_folded,cmpres); g_free(s1_folded); g_free(s2_folded); return cmpres; @@ -509,7 +509,7 @@ spawn_process(char **argv) pid_t pid; sigset_t set, old; - dbg(1,"spawning process for '%s'\n", argv[0]); + dbg(lvl_warning,"spawning process for '%s'\n", argv[0]); sigemptyset(&set); sigaddset(&set,SIGCHLD); spawn_process_sigmask(SIG_BLOCK,&set,&old); @@ -523,7 +523,7 @@ spawn_process(char **argv) r->pid=pid; spawn_process_children=g_list_prepend(spawn_process_children,r); } else { - dbg(0,"fork() returned error."); + dbg(lvl_error,"fork() returned error."); g_free(r); r=NULL; } @@ -550,7 +550,7 @@ spawn_process(char **argv) args=newSysString(cmdline); cmd = newSysString(argv[0]); dwRet=CreateProcess(cmd, args, NULL, NULL, 0, 0, NULL, NULL, NULL, &(r->pr)); - dbg(0, "CreateProcess(%s,%s), PID=%i\n",argv[0],cmdline,r->pr.dwProcessId); + dbg(lvl_error, "CreateProcess(%s,%s), PID=%i\n",argv[0],cmdline,r->pr.dwProcessId); g_free(cmd); #else TCHAR* args; @@ -560,7 +560,7 @@ spawn_process(char **argv) cmdline=spawn_process_compose_cmdline(argv); args=newSysString(cmdline); dwRet=CreateProcess(NULL, args, NULL, NULL, 0, 0, NULL, NULL, &startupInfo, &(r->pr)); - dbg(0, "CreateProcess(%s), PID=%i\n",cmdline,r->pr.dwProcessId); + dbg(lvl_error, "CreateProcess(%s), PID=%i\n",cmdline,r->pr.dwProcessId); #endif g_free(cmdline); g_free(args); @@ -570,7 +570,7 @@ spawn_process(char **argv) { char *cmdline=spawn_process_compose_cmdline(argv); int status; - dbg(0,"Unblocked spawn_process isn't availiable on this platform.\n"); + dbg(lvl_error,"Unblocked spawn_process isn't availiable on this platform.\n"); status=system(cmdline); g_free(cmdline); r->status=status; @@ -593,7 +593,7 @@ spawn_process(char **argv) int spawn_process_check_status(struct spawn_process_info *pi, int block) { if(pi==NULL) { - dbg(0,"Trying to get process status of NULL, assuming process is terminated.\n"); + dbg(lvl_error,"Trying to get process status of NULL, assuming process is terminated.\n"); return 255; } #ifdef HAVE_API_WIN32_BASE @@ -606,7 +606,7 @@ int spawn_process_check_status(struct spawn_process_info *pi, int block) break; } } else { - dbg(0,"GetExitCodeProcess failed. Assuming the process is terminated."); + dbg(lvl_error,"GetExitCodeProcess failed. Assuming the process is terminated."); return 255; } if(!block) @@ -614,7 +614,7 @@ int spawn_process_check_status(struct spawn_process_info *pi, int block) dw=WaitForSingleObject(pi->pr.hProcess,INFINITE); if(dw==WAIT_FAILED && failcount++==1) { - dbg(0,"WaitForSingleObject failed twice. Assuming the process is terminated."); + dbg(lvl_error,"WaitForSingleObject failed twice. Assuming the process is terminated."); return 0; break; } @@ -633,9 +633,9 @@ int spawn_process_check_status(struct spawn_process_info *pi, int block) pi->status=WEXITSTATUS(status); return pi->status; if(WIFSTOPPED(status)) { - dbg(0,"child is stopped by %i signal\n",WSTOPSIG(status)); + dbg(lvl_error,"child is stopped by %i signal\n",WSTOPSIG(status)); } else if (WIFSIGNALED(status)) { - dbg(0,"child terminated by signal %i\n",WEXITSTATUS(status)); + dbg(lvl_error,"child terminated by signal %i\n",WEXITSTATUS(status)); pi->status=255; return 255; } @@ -647,12 +647,12 @@ int spawn_process_check_status(struct spawn_process_info *pi, int block) } else { if(pi->status!=-1) // Signal handler has changed pi->status while in this function return pi->status; - dbg(0,"waitpid() indicated error, reporting process termination.\n"); + dbg(lvl_error,"waitpid() indicated error, reporting process termination.\n"); return 255; } } #else - dbg(0, "Non-blocking spawn_process isn't availiable for this platform, repoting process exit status.\n"); + dbg(lvl_error, "Non-blocking spawn_process isn't availiable for this platform, repoting process exit status.\n"); return pi->status; #endif #endif |