[gnome-keyring] egg: Remove egg_mkdtemp() functions and use g_mkdtemp() instead



commit c7fc0421ece00e684f5932a6285c122a917bf610
Author: Stef Walter <stefw gnome org>
Date:   Thu Mar 6 11:02:24 2014 +0100

    egg: Remove egg_mkdtemp() functions and use g_mkdtemp() instead

 configure.ac      |    2 -
 daemon/gkd-util.c |    3 +-
 egg/Makefile.am   |    2 -
 egg/egg-mkdtemp.c |  196 -----------------------------------------------------
 egg/egg-mkdtemp.h |   27 -------
 egg/egg-testing.c |    3 +-
 egg/egg-timegm.c  |    2 -
 egg/egg-timegm.h  |    2 -
 8 files changed, 2 insertions(+), 235 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ff6370c..f58f51d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,8 +152,6 @@ AC_CHECK_FUNCS(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock]))
 
 AC_CHECK_FUNCS(timegm, AC_DEFINE(HAVE_TIMEGM,1,[Have timegm]))
 
-dnl mkdtemp replacement from gettext
-AC_REPLACE_FUNCS(mkdtemp)
 AC_STAT_MACROS_BROKEN
   AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
diff --git a/daemon/gkd-util.c b/daemon/gkd-util.c
index 83c442d..3ba2d0c 100644
--- a/daemon/gkd-util.c
+++ b/daemon/gkd-util.c
@@ -25,7 +25,6 @@
 #include "gkd-util.h"
 
 #include "egg/egg-cleanup.h"
-#include "egg/egg-mkdtemp.h"
 #include "egg/egg-unix-credentials.h"
 
 #include <glib.h>
@@ -113,7 +112,7 @@ gkd_util_init_master_directory (const gchar *replace)
        /* Generate a new directory */
        if (!valid) {
                master_directory = g_build_filename (g_get_user_runtime_dir (), "keyring-XXXXXX", NULL);
-               if (egg_mkdtemp (master_directory) == NULL)
+               if (g_mkdtemp (master_directory) == NULL)
                        g_warning ("couldn't create socket directory: %s", g_strerror (errno));
 
        /* A directory was supplied, but doesn't exist yet */
diff --git a/egg/Makefile.am b/egg/Makefile.am
index 21d9898..f489357 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -28,7 +28,6 @@ libegg_la_SOURCES = \
        egg/egg-hex.c egg/egg-hex.h \
        egg/egg-hkdf.c egg/egg-hkdf.h \
        egg/egg-libgcrypt.c egg/egg-libgcrypt.h \
-       egg/egg-mkdtemp.c egg/egg-mkdtemp.h \
        egg/egg-oid.c egg/egg-oid.h \
        egg/egg-padding.c egg/egg-padding.h \
        egg/egg-openssl.c egg/egg-openssl.h \
@@ -105,7 +104,6 @@ libegg_hex_la_LIBS = \
        $(GLIB_LIBS)
 
 libegg_test_la_SOURCES = \
-       egg/egg-mkdtemp.c egg/egg-mkdtemp.h \
        egg/egg-testing.c egg/egg-testing.h
 
 libegg_test_la_CFLAGS = \
diff --git a/egg/egg-testing.c b/egg/egg-testing.c
index 7a6b5df..adca603 100644
--- a/egg/egg-testing.c
+++ b/egg/egg-testing.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include "egg-mkdtemp.h"
 #include "egg-testing.h"
 
 #include <glib/gstdio.h>
@@ -268,7 +267,7 @@ egg_tests_create_scratch_directory (const gchar *file_to_copy,
        directory = g_strdup_printf ("/tmp/scratch-%s.XXXXXX", basename);
        g_free (basename);
 
-       if (!egg_mkdtemp (directory))
+       if (!g_mkdtemp (directory))
                g_assert_not_reached ();
 
        va_start (va, file_to_copy);
diff --git a/egg/egg-timegm.c b/egg/egg-timegm.c
index c3effdf..47d6f0d 100644
--- a/egg/egg-timegm.c
+++ b/egg/egg-timegm.c
@@ -16,8 +16,6 @@
    <http://www.gnu.org/licenses/>.
 */
 
-/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/egg/egg-timegm.h b/egg/egg-timegm.h
index b24c14c..a68a1ae 100644
--- a/egg/egg-timegm.h
+++ b/egg/egg-timegm.h
@@ -17,8 +17,6 @@
    <http://www.gnu.org/licenses/>.
 */
 
-/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
-
 #ifndef EGG_TIMEGM_H_
 #define EGG_TIMEGM_H_
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]