From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Wed, 12 Aug 2015 11:14:15 +0000 (+0200)
Subject: Rimossa funzione g_mkdtemp che è presente nelle glib dalla 2.30.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=c59d995f977aacb5080aee302b7f4d53f50d5e0c;p=solipa%2Flibsolipa

Rimossa funzione g_mkdtemp che è presente nelle glib dalla 2.30.
---

diff --git a/src/utils.c b/src/utils.c
index 64516ff..4202a27 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2063,87 +2063,3 @@ GValue
 
 	return gval;
 }
-
-/**
- * This function is copied from
- * http://bugzilla.gnome.org/show_bug.cgi?id=524831.
- *
- * If/when this function gets added to glib, it can be removed from
- * sources.
- *
- *
- * g_mkdtemp:
- * @tmpl: template directory name
- *
- * Creates a temporary directory. See the mkdtemp() documentation
- * on most UNIX-like systems.
- *
- * The parameter is a string that should follow the rules for
- * mkdtemp() templates, i.e. contain the string "XXXXXX".  g_mkdtemp()
- * is slightly more flexible than mkdtemp() in that the sequence does
- * not have to occur at the very end of the template. The X string
- * will be modified to form the name of a directory that didn't
- * already exist.  The string should be in the GLib file name
- * encoding. Most importantly, on Windows it should be in UTF-8.
- *
-  * Return value: If a temporary directory was successfully created,
- * @tmpl will be returned with the XXXXXX string modified in such a
- * way as to make the path unique.  In case of errors, %NULL is
- * returned.
- */
-gchar *
-g_mkdtemp (gchar *tmpl)
-{
-  static const char letters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  static const int NLETTERS = sizeof (letters) - 1;
-  static int counter = 0;
-  char *XXXXXX;
-  GTimeVal tv;
-  glong value;
-  int count;
-
-  /* find the last occurrence of "XXXXXX" */
-  XXXXXX = g_strrstr (tmpl, "XXXXXX");
-
-  if (!XXXXXX || strncmp (XXXXXX, "XXXXXX", 6))
-    {
-      errno = EINVAL;
-      return NULL;
-    }
-
-  /* Get some more or less random data.  */
-  g_get_current_time (&tv);
-  value = (tv.tv_usec ^ tv.tv_sec) + counter++;
-
-  for (count = 0; count < 100; value += 7777, ++count)
-    {
-      glong v = value;
-
-      /* Fill in the random bits.  */
-      XXXXXX[0] = letters[v % NLETTERS];
-      v /= NLETTERS;
-      XXXXXX[1] = letters[v % NLETTERS];
-      v /= NLETTERS;
-      XXXXXX[2] = letters[v % NLETTERS];
-      v /= NLETTERS;
-      XXXXXX[3] = letters[v % NLETTERS];
-      v /= NLETTERS;
-      XXXXXX[4] = letters[v % NLETTERS];
-      v /= NLETTERS;
-      XXXXXX[5] = letters[v % NLETTERS];
-
-      /* tmpl is in UTF-8 on Windows, thus use g_mkdir() */
-      if (g_mkdir (tmpl, 0700) == 0)
-        return tmpl;
-
-      if (errno != EEXIST)
-         /* Any other error will apply also to other names we might
-         *  try, and there are 2^32 or so of them, so give up now.
-         */
-         return NULL;
-    }
-
-  /* We got out of the loop because we ran out of combinations to try.  */
-  errno = EEXIST;
-  return NULL;
-}
diff --git a/src/utils.h b/src/utils.h
index d00b7ff..7516736 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -113,8 +113,6 @@ GValue *solipa_gvalue_new_string (const gchar *str);
 GValue *solipa_gvalue_new_boolean (gboolean b);
 GValue *solipa_gvalue_new_float (gfloat f);
 
-gchar *g_mkdtemp (gchar *tmpl);
-
 
 G_END_DECLS