summaryrefslogtreecommitdiff
path: root/daemon/gvfsbackendsmb.c
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2014-10-19 09:03:51 +0100
committerRoss Lagerwall <rosslagerwall@gmail.com>2015-02-09 23:14:17 +0000
commitfcd88e9ee0c68c5f0e15fb402c22b26dc4415299 (patch)
tree4397baf7f83f5dc26ec66c99440934f20c89c3cc /daemon/gvfsbackendsmb.c
parent221378f58f50bdf6e780e668539e875bac581826 (diff)
downloadgvfs-fcd88e9ee0c68c5f0e15fb402c22b26dc4415299.tar.gz
daemon: Move random string generation into shared lib
Random string generation is used in a few different places, so share the implementation. https://bugzilla.gnome.org/show_bug.cgi?id=738967
Diffstat (limited to 'daemon/gvfsbackendsmb.c')
-rw-r--r--daemon/gvfsbackendsmb.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c
index bdfb3659..4b0df517 100644
--- a/daemon/gvfsbackendsmb.c
+++ b/daemon/gvfsbackendsmb.c
@@ -49,6 +49,8 @@
#include "gvfsjobqueryattributes.h"
#include "gvfsjobenumerate.h"
#include "gvfsdaemonprotocol.h"
+#include "gvfsdaemonutils.h"
+#include "gvfsutils.h"
#include "gvfskeyring.h"
#include <libsmbclient.h>
@@ -1052,16 +1054,6 @@ do_append_to (GVfsBackend *backend,
}
-static void
-random_chars (char *str, int len)
-{
- int i;
- const char chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
- for (i = 0; i < len; i++)
- str[i] = chars[g_random_int_range (0, strlen(chars))];
-}
-
static char *
get_dir_from_uri (const char *uri)
{
@@ -1095,7 +1087,7 @@ open_tmpfile (GVfsBackendSmb *backend,
dir_uri = get_dir_from_uri (uri);
do {
- random_chars (filename + 4, 4);
+ gvfs_randomize_string (filename + 4, 4);
tmp_uri = g_strconcat (dir_uri, filename, NULL);
smbc_open = smbc_getFunctionOpen (backend->smb_context);