projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move debug.c
[apps/madmutt.git]
/
from.c
diff --git
a/from.c
b/from.c
index
33d6e84
..
eafdfe6
100644
(file)
--- a/
from.c
+++ b/
from.c
@@
-11,21
+11,22
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#include "mutt.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-
#include <ctype.h>
#include <string.h>
#include <ctype.h>
#include <string.h>
-static const char *next_word (const char *s)
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include "mutt.h"
+
+static const char *next_word(const char *s)
{
{
-
while (*s && !ISSPACE
(*s))
- s++;
-
SKIPWS
(s);
- return s;
+
while (*s && !ISSPACE
(*s))
+
s++;
+
s = skipspaces
(s);
+
return s;
}
int mutt_check_month (const char *s)
}
int mutt_check_month (const char *s)
@@
-33,7
+34,7
@@
int mutt_check_month (const char *s)
int i;
for (i = 0; i < 12; i++)
int i;
for (i = 0; i < 12; i++)
- if (m
utt_strncasecmp
(s, Months[i], 3) == 0)
+ if (m
_strncasecmp
(s, Months[i], 3) == 0)
return (i);
return (-1); /* error */
}
return (i);
return (-1); /* error */
}
@@
-42,10
+43,10
@@
static int is_day_name (const char *s)
{
int i;
{
int i;
- if ((m
utt_strlen
(s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
+ if ((m
_strlen
(s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
return 0;
for (i = 0; i < 7; i++)
return 0;
for (i = 0; i < 7; i++)
- if (m
utt_strncasecmp
(s, Weekdays[i], 3) == 0)
+ if (m
_strncasecmp
(s, Weekdays[i], 3) == 0)
return 1;
return 0;
}
return 1;
return 0;
}
@@
-64,14
+65,14
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
if (path)
*path = 0;
if (path)
*path = 0;
- if (m
utt_strncmp
("From ", s, 5) != 0)
+ if (m
_strncmp
("From ", s, 5) != 0)
return 0;
s = next_word (s); /* skip over the From part. */
if (!*s)
return 0;
return 0;
s = next_word (s); /* skip over the From part. */
if (!*s)
return 0;
- d
print (3, (debugfile, "\nis_from(): parsing: %s
", s));
+ d
ebug_print (3, ("parsing: %s\n
", s));
if (!is_day_name (s)) {
const char *p;
if (!is_day_name (s)) {
const char *p;
@@
-97,16
+98,15
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
len = pathlen - 1;
memcpy (path, s, len);
path[len] = 0;
len = pathlen - 1;
memcpy (path, s, len);
path[len] = 0;
- d
print (3, (debugfile, "is_from():
got return path: %s\n", path));
+ d
ebug_print (3, ("
got return path: %s\n", path));
}
}
- s = p + 1;
- SKIPWS (s);
+ s = vskipspaces(p + 1);
if (!*s)
return 0;
if (!is_day_name (s)) {
if (!*s)
return 0;
if (!is_day_name (s)) {
- d
print (1, (debugfile, "is_from():
expected weekday, got: %s\n", s));
+ d
ebug_print (1, ("
expected weekday, got: %s\n", s));
return 0;
}
}
return 0;
}
}
@@
-174,9
+174,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);
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));
tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
tm.tm_year));