diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2020-01-02 22:27:35 +0100 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-01-14 14:45:15 +0000 |
| commit | ce60975698b24f3836303c91b5bfacf3b94387a8 (patch) | |
| tree | c1129e220fe3f55a291280dcbd4ffbdbc1d2f487 /pkcs11/secret-store | |
| parent | a3b876c514ae3beba36e20d1eebc521c17ca9385 (diff) | |
| download | gnome-keyring-ce60975698b24f3836303c91b5bfacf3b94387a8.tar.gz | |
Don't use GTimeVal/g_get_current_time()
`GTimeVal` is not safe for a post-2038 world, so it was deprecated.
Let's get rid of it in favor of `g_get_real_time()`.
Diffstat (limited to 'pkcs11/secret-store')
| -rw-r--r-- | pkcs11/secret-store/gkm-secret-object.c | 15 | ||||
| -rw-r--r-- | pkcs11/secret-store/test-secret-object.c | 6 |
2 files changed, 6 insertions, 15 deletions
diff --git a/pkcs11/secret-store/gkm-secret-object.c b/pkcs11/secret-store/gkm-secret-object.c index acc63707..53948dc3 100644 --- a/pkcs11/secret-store/gkm-secret-object.c +++ b/pkcs11/secret-store/gkm-secret-object.c @@ -357,13 +357,10 @@ gkm_secret_object_get_created (GkmSecretObject *self) void gkm_secret_object_set_created (GkmSecretObject *self, glong when) { - GTimeVal tv; - g_return_if_fail (GKM_IS_SECRET_OBJECT (self)); if (when < 0) { - g_get_current_time (&tv); - when = tv.tv_sec; + when = g_get_real_time () / G_USEC_PER_SEC; } self->pv->created = when; @@ -373,12 +370,9 @@ gkm_secret_object_set_created (GkmSecretObject *self, glong when) void gkm_secret_object_mark_created (GkmSecretObject *self) { - GTimeVal tv; - g_return_if_fail (GKM_IS_SECRET_OBJECT (self)); - g_get_current_time (&tv); - gkm_secret_object_set_created (self, tv.tv_sec); + gkm_secret_object_set_created (self, g_get_real_time () / G_USEC_PER_SEC); } glong @@ -420,14 +414,11 @@ void gkm_secret_object_begin_modified (GkmSecretObject *self, GkmTransaction *transaction) { - GTimeVal tv; - g_return_if_fail (!gkm_transaction_get_failed (transaction)); gkm_transaction_add (transaction, self, complete_set_modified, g_memdup (&self->pv->modified, sizeof (gulong))); - g_get_current_time (&tv); - self->pv->modified = tv.tv_sec; + self->pv->modified = g_get_real_time () / G_USEC_PER_SEC; } gboolean diff --git a/pkcs11/secret-store/test-secret-object.c b/pkcs11/secret-store/test-secret-object.c index 9855c061..122f210d 100644 --- a/pkcs11/secret-store/test-secret-object.c +++ b/pkcs11/secret-store/test-secret-object.c @@ -129,15 +129,15 @@ static void test_was_modified (Test *test, gconstpointer unused) { GkmTransaction *transaction; - GTimeVal tv; + gint64 now; - g_get_current_time (&tv); + now = g_get_real_time () / G_USEC_PER_SEC; transaction = gkm_transaction_new (); gkm_secret_object_begin_modified (test->object, transaction); g_assert_cmpuint (gkm_transaction_complete_and_unref (transaction), ==, CKR_OK); - g_assert (tv.tv_sec == gkm_secret_object_get_modified (test->object)); + g_assert (now == gkm_secret_object_get_modified (test->object)); } static void |