diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.ja | 9 | ||||
| -rw-r--r-- | src/jpilot.c | 2 | ||||
| -rw-r--r-- | src/procheader.c | 3 | ||||
| -rw-r--r-- | src/rfc2015.c | 4 | ||||
| -rw-r--r-- | src/utils.c | 7 | ||||
| -rw-r--r-- | src/utils.h | 5 | ||||
| -rw-r--r-- | src/vcard.c | 3 |
8 files changed, 35 insertions, 7 deletions
@@ -1,5 +1,14 @@ 2005-06-24 + * src/utils.[ch] + src/rfc2015.c: use a wrapper of strftime() to suppress the warning + of gcc about %c. + * src/procheader.c: removed warning about invalid date. + * src/jpilot.c + src/vcard.c: use get_home_dir() instead of g_get_home_dir(). + +2005-06-24 + * src/prefs_common.[ch]: removed unused option 'enable_hscrollbar'. 2005-06-24 diff --git a/ChangeLog.ja b/ChangeLog.ja index ee435788..729493d0 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,14 @@ 2005-06-24 + * src/utils.[ch] + src/rfc2015.c: gcc の %c についての警告を抑制するために strftime() + のラッパーを使用。 + * src/procheader.c: 不正な日付に対する警告を削除。 + * src/jpilot.c + src/vcard.c: g_get_home_dir() の代わりに get_home_dir() を使用。 + +2005-06-24 + * src/prefs_common.[ch]: 未使用のオプション 'enable_hscrollbar' を 削除。 diff --git a/src/jpilot.c b/src/jpilot.c index 826491b6..7e5caa49 100644 --- a/src/jpilot.c +++ b/src/jpilot.c @@ -1625,7 +1625,7 @@ gchar *jpilot_find_pilotdb( void ) { gint len; FILE *fp; - homedir = g_get_home_dir(); + homedir = get_home_dir(); if( ! homedir ) return g_strdup( "" ); strcpy( str, homedir ); diff --git a/src/procheader.c b/src/procheader.c index fc60836d..cf1331cf 100644 --- a/src/procheader.c +++ b/src/procheader.c @@ -736,7 +736,6 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len) if (procheader_scan_date_string(src, weekday, &day, month, &year, &hh, &mm, &ss, zone) < 0) { - g_warning("Invalid date: %s\n", src); if (dest && len > 0) strncpy2(dest, src, len); return 0; @@ -757,8 +756,6 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len) break; } } - if (*p == '\0') - g_warning("Invalid month: %s\n", month); t.tm_sec = ss; t.tm_min = mm; diff --git a/src/rfc2015.c b/src/rfc2015.c index 5f007964..22025310 100644 --- a/src/rfc2015.c +++ b/src/rfc2015.c @@ -168,8 +168,8 @@ sig_status_full (gpgme_ctx_t ctx, gpgme_verify_result_t result) if (sig->timestamp != 0) { created = sig->timestamp; ctime_val = localtime (&created); - strftime (ctime_str, sizeof (ctime_str), "%c", - ctime_val); + my_strftime (ctime_str, sizeof (ctime_str), "%c", + ctime_val); ctime_str_utf8 = conv_localetodisp (ctime_str, NULL); g_string_sprintfa (str, _("Signature made at %s\n"), diff --git a/src/utils.c b/src/utils.c index 1638bba9..3d022d9e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -3151,6 +3151,13 @@ void get_rfc822_date(gchar *buf, gint len) day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t)); } +/* just a wrapper to suppress the warning of gcc about %c */ +size_t my_strftime(gchar *s, size_t max, const gchar *format, + const struct tm *tm) +{ + return strftime(s, max, format, tm); +} + static FILE *log_fp = NULL; void set_log_file(const gchar *filename) diff --git a/src/utils.h b/src/utils.h index 1b7c4391..46767d90 100644 --- a/src/utils.h +++ b/src/utils.h @@ -425,6 +425,11 @@ gchar *tzoffset (time_t *now); void get_rfc822_date (gchar *buf, gint len); +size_t my_strftime (gchar *s, + size_t max, + const gchar *format, + const struct tm *tm); + /* logging */ void set_log_file (const gchar *filename); void close_log_file (void); diff --git a/src/vcard.c b/src/vcard.c index 80440ee9..286292a7 100644 --- a/src/vcard.c +++ b/src/vcard.c @@ -31,6 +31,7 @@ #include "vcard.h" #include "addritem.h" #include "addrcache.h" +#include "utils.h" #define GNOMECARD_DIR ".gnome" #define GNOMECARD_FILE "GnomeCard" @@ -650,7 +651,7 @@ gchar *vcard_find_gnomecard( void ) { gint len, lenlbl, i; FILE *fp; - homedir = g_get_home_dir(); + homedir = get_home_dir(); if( ! homedir ) return NULL; strcpy( str, homedir ); |