|
From: Paul F. <pg...@us...> - 2008-08-07 04:09:16
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18879 Modified Files: roadmap.h roadmap_log.c Log Message: suppress some string constant to char* conversion warnings (apparently this conversion is now deprecated in c++) Index: roadmap_log.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_log.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** roadmap_log.c 7 May 2008 14:01:11 -0000 1.22 --- roadmap_log.c 7 Aug 2008 04:09:11 -0000 1.23 *************** *** 139,145 **** FILE *file, char saved, ! char *source, int line, ! char *format, va_list ap) { --- 139,145 ---- FILE *file, char saved, ! const char *source, int line, ! const char *format, va_list ap) { *************** *** 164,168 **** static void roadmap_redirect_one (struct roadmap_message_descriptor *category, ! char *format, va_list ap) { --- 164,168 ---- static void roadmap_redirect_one (struct roadmap_message_descriptor *category, ! const char *format, va_list ap) { *************** *** 179,183 **** ! void roadmap_log (int level, char *source, int line, char *format, ...) { FILE *file; --- 179,184 ---- ! void roadmap_log (int level, const char *source, ! int line, const char *format, ...) { FILE *file; *************** *** 241,245 **** void roadmap_check_allocated_with_source_line ! (char *source, int line, const void *allocated) { if (allocated == NULL) { --- 242,246 ---- void roadmap_check_allocated_with_source_line ! (const char *source, int line, const void *allocated) { if (allocated == NULL) { Index: roadmap.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** roadmap.h 25 Jun 2008 21:45:17 -0000 1.26 --- roadmap.h 7 Aug 2008 04:09:11 -0000 1.27 *************** *** 47,51 **** void roadmap_log_reset_stack (void); ! void roadmap_log (int level, char *source, int line, char *format, ...); void roadmap_log_save_all (void); --- 47,51 ---- void roadmap_log_reset_stack (void); ! void roadmap_log (int level, const char *source, int line, const char *format, ...); void roadmap_log_save_all (void); *************** *** 97,101 **** /* This function is hidden by a macro: */ void roadmap_check_allocated_with_source_line ! (char *source, int line, const void *allocated); typedef void (* RoadMapCallback) (void); --- 97,101 ---- /* This function is hidden by a macro: */ void roadmap_check_allocated_with_source_line ! (const char *source, int line, const void *allocated); typedef void (* RoadMapCallback) (void); |