X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=e3d2ad36c8b737b40c77f09b0a1ea0bca24c1fb1;hp=23cc26494f7b847efd9e01caf0faf9236c841156;hb=f997801a16ce4a8530cb30cddebfe6243cb3502d;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b diff --git a/from.c b/from.c index 23cc264..e3d2ad3 100644 --- a/from.c +++ b/from.c @@ -16,6 +16,7 @@ #include "lib/mem.h" #include "lib/intl.h" #include "lib/str.h" +#include "lib/debug.h" #include #include @@ -71,7 +72,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp) if (!*s) return 0; - dprint (3, (debugfile, "\nis_from(): parsing: %s", s)); + debug_print (3, ("parsing: %s\n", s)); if (!is_day_name (s)) { const char *p; @@ -97,7 +98,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp) len = pathlen - 1; memcpy (path, s, len); path[len] = 0; - dprint (3, (debugfile, "is_from(): got return path: %s\n", path)); + debug_print (3, ("got return path: %s\n", path)); } s = p + 1; @@ -106,7 +107,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp) return 0; if (!is_day_name (s)) { - dprint (1, (debugfile, "is_from(): expected weekday, got: %s\n", s)); + debug_print (1, ("expected weekday, got: %s\n", s)); return 0; } } @@ -174,9 +175,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp) return 0; tm.tm_year = yr > 1900 ? yr - 1900 : (yr < 70 ? yr + 100 : yr); - dprint (3, - (debugfile, - "is_from(): month=%d, day=%d, hr=%d, min=%d, sec=%d, yr=%d.\n", + debug_print (3, ("month=%d, day=%d, hr=%d, min=%d, sec=%d, yr=%d.\n", tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year));