[svn] GnuPG - r5310 - trunk/common
svn author wk
cvs at cvs.gnupg.org
Tue Apr 20 13:52:33 CEST 2010
Author: wk
Date: 2010-04-20 13:52:33 +0200 (Tue, 20 Apr 2010)
New Revision: 5310
Added:
trunk/common/gettime.h
Modified:
trunk/common/ChangeLog
trunk/common/gettime.c
trunk/common/util.h
Log:
Add a separate header for time related fucntions.
Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog 2010-04-20 01:11:35 UTC (rev 5309)
+++ trunk/common/ChangeLog 2010-04-20 11:52:33 UTC (rev 5310)
@@ -10,6 +10,16 @@
* t-exechelp.c (test_close_all_fds): Use dummy variables to
silence gcc warning.
+2010-04-15 Werner Koch <wk at g10code.com>
+
+ * util.h: Factor time related fucntions out to ...
+ * gettime.h: New.
+ (gnupg_copy_time): Move to ...
+ * gettime.c (gnupg_copy_time): New.
+
+ * sysutils.c (gnupg_setenv) [!W32CE]: Add missing return.
+ (gnupg_unsetenv) [!W32CE]: Add missing return.
+
2010-04-14 Werner Koch <wk at g10code.com>
* Makefile.am (noinst_LIBRARIES) [W32CE]: Exclude libsimple-pwquery.
Modified: trunk/common/gettime.c
===================================================================
--- trunk/common/gettime.c 2010-04-20 01:11:35 UTC (rev 5309)
+++ trunk/common/gettime.c 2010-04-20 11:52:33 UTC (rev 5310)
@@ -27,6 +27,7 @@
#include "util.h"
#include "i18n.h"
+#include "gettime.h"
static unsigned long timewarp;
static enum { NORMAL = 0, FROZEN, FUTURE, PAST } timemode;
@@ -507,6 +508,23 @@
}
+/* Copy one ISO date to another, this is inline so that we can do a
+ minimal sanity check. A null date (empty string) is allowed. */
+void
+gnupg_copy_time (gnupg_isotime_t d, const gnupg_isotime_t s)
+{
+ if (*s)
+ {
+ if ((strlen (s) != 15 || s[8] != 'T'))
+ BUG();
+ memcpy (d, s, 15);
+ d[15] = 0;
+ }
+ else
+ *d = 0;
+}
+
+
/* Add SECONDS to ATIME. SECONDS may not be negative and is limited
to about the equivalent of 62 years which should be more then
enough for our purposes. */
Added: trunk/common/gettime.h
===================================================================
--- trunk/common/gettime.h (rev 0)
+++ trunk/common/gettime.h 2010-04-20 11:52:33 UTC (rev 5310)
@@ -0,0 +1,51 @@
+/* gettime.h - Wrapper for time functions
+ * Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GNUPG_COMMON_GETTIME_H
+#define GNUPG_COMMON_GETTIME_H
+
+#include <time.h> /* We need time_t. */
+#include <gpg-error.h> /* We need gpg_error_t. */
+
+
+/* A type to hold the ISO time. Note that this this is the same as
+ the the KSBA type ksba_isotime_t. */
+typedef char gnupg_isotime_t[16];
+
+time_t gnupg_get_time (void);
+void gnupg_get_isotime (gnupg_isotime_t timebuf);
+void gnupg_set_time (time_t newtime, int freeze);
+int gnupg_faked_time_p (void);
+u32 make_timestamp (void);
+u32 scan_isodatestr (const char *string);
+time_t isotime2epoch (const char *string);
+void epoch2isotime (gnupg_isotime_t timebuf, time_t atime);
+u32 add_days_to_timestamp (u32 stamp, u16 days);
+const char *strtimevalue (u32 stamp);
+const char *strtimestamp (u32 stamp); /* GMT */
+const char *isotimestamp (u32 stamp); /* GMT */
+const char *asctimestamp (u32 stamp); /* localized */
+gpg_error_t add_seconds_to_isotime (gnupg_isotime_t atime, int nseconds);
+gpg_error_t add_days_to_isotime (gnupg_isotime_t atime, int ndays);
+gpg_error_t check_isotime (const gnupg_isotime_t atime);
+void dump_isotime (const gnupg_isotime_t atime);
+void gnupg_copy_time (gnupg_isotime_t d, const gnupg_isotime_t s);
+
+
+#endif /*GNUPG_COMMON_GETTIME_H*/
Modified: trunk/common/util.h
===================================================================
--- trunk/common/util.h 2010-04-20 01:11:35 UTC (rev 5309)
+++ trunk/common/util.h 2010-04-20 11:52:33 UTC (rev 5310)
@@ -21,7 +21,6 @@
#define GNUPG_COMMON_UTIL_H
#include <gcrypt.h> /* We need this for the memory function protos. */
-#include <time.h> /* We need time_t. */
#include <errno.h> /* We need errno. */
#include <gpg-error.h> /* We need gpg_error_t. */
@@ -43,6 +42,7 @@
#include "../common/dynload.h"
#include "init.h"
+#include "gettime.h"
/* Redefine asprintf by our estream version which uses our own memory
allocator.. */
@@ -98,47 +98,7 @@
return gpg_error_from_syserror ();
}
-/* A type to hold the ISO time. Note that this this is the same as
- the the KSBA type ksba_isotime_t. */
-typedef char gnupg_isotime_t[16];
-
-/*-- gettime.c --*/
-time_t gnupg_get_time (void);
-void gnupg_get_isotime (gnupg_isotime_t timebuf);
-void gnupg_set_time (time_t newtime, int freeze);
-int gnupg_faked_time_p (void);
-u32 make_timestamp (void);
-u32 scan_isodatestr (const char *string);
-time_t isotime2epoch (const char *string);
-void epoch2isotime (gnupg_isotime_t timebuf, time_t atime);
-u32 add_days_to_timestamp (u32 stamp, u16 days);
-const char *strtimevalue (u32 stamp);
-const char *strtimestamp (u32 stamp); /* GMT */
-const char *isotimestamp (u32 stamp); /* GMT */
-const char *asctimestamp (u32 stamp); /* localized */
-gpg_error_t add_seconds_to_isotime (gnupg_isotime_t atime, int nseconds);
-gpg_error_t add_days_to_isotime (gnupg_isotime_t atime, int ndays);
-gpg_error_t check_isotime (const gnupg_isotime_t atime);
-void dump_isotime (const gnupg_isotime_t atime);
-
-/* Copy one ISO date to another, this is inline so that we can do a
- minimal sanity check. A null date (empty string) is allowed. */
-static inline void
-gnupg_copy_time (gnupg_isotime_t d, const gnupg_isotime_t s)
-{
- if (*s)
- {
- if ((strlen (s) != 15 || s[8] != 'T'))
- BUG();
- memcpy (d, s, 15);
- d[15] = 0;
- }
- else
- *d = 0;
-}
-
-
/*-- signal.c --*/
void gnupg_init_signals (int mode, void (*fast_cleanup)(void));
void gnupg_block_all_signals (void);
More information about the Gnupg-commits
mailing list