projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove most of the debug code: often makes the code unreadable, for little
[apps/madmutt.git]
/
from.c
diff --git
a/from.c
b/from.c
index
eafdfe6
..
7122052
100644
(file)
--- a/
from.c
+++ b/
from.c
@@
-17,7
+17,6
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
#include "mutt.h"
#include "mutt.h"
@@
-57,7
+56,7
@@
static int is_day_name (const char *s)
* From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
*/
* From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
*/
-int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
+int is_from (const char *s, char *path, s
s
ize_t pathlen, time_t * tp)
{
struct tm tm;
int yr;
{
struct tm tm;
int yr;
@@
-72,11
+71,9
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
if (!*s)
return 0;
if (!*s)
return 0;
- debug_print (3, ("parsing: %s\n", s));
-
if (!is_day_name (s)) {
const char *p;
if (!is_day_name (s)) {
const char *p;
- size_t len;
+ s
s
ize_t len;
short q = 0;
for (p = s; *p && (q || !ISSPACE (*p)); p++) {
short q = 0;
for (p = s; *p && (q || !ISSPACE (*p)); p++) {
@@
-93,12
+90,11
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
return 0;
if (path) {
return 0;
if (path) {
- len =
(size_t) (p - s)
;
+ len =
p - s
;
if (len + 1 > pathlen)
len = pathlen - 1;
memcpy (path, s, len);
path[len] = 0;
if (len + 1 > pathlen)
len = pathlen - 1;
memcpy (path, s, len);
path[len] = 0;
- debug_print (3, ("got return path: %s\n", path));
}
s = vskipspaces(p + 1);
}
s = vskipspaces(p + 1);
@@
-106,7
+102,6
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
return 0;
if (!is_day_name (s)) {
return 0;
if (!is_day_name (s)) {
- debug_print (1, ("expected weekday, got: %s\n", s));
return 0;
}
}
return 0;
}
}
@@
-174,10
+169,6
@@
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);
- 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_isdst = -1;
if (tp)
tm.tm_isdst = -1;
if (tp)