diff options
author | Jonathan Beck | 2009-01-04 22:21:15 +0100 |
---|---|---|
committer | Jonathan Beck | 2009-01-04 22:21:15 +0100 |
commit | 5514a3b2a9734d311e4f6014585f922e0b748cab (patch) | |
tree | ca88a32519d6a07da72d15632de7af04461f7ba8 /src/initconf.c | |
parent | 4301ef9bb8e9d06ffa4e9172191d58ede5e16f5d (diff) | |
parent | 5cde55426112a8cb79d809dae5f61e347c007212 (diff) | |
download | libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.gz libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.bz2 |
Merge branch 'master' into plist
Conflicts:
src/AFC.c
src/lockdown.c
src/lockdown.h
src/plist.c
src/plist.h
Diffstat (limited to 'src/initconf.c')
-rw-r--r-- | src/initconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/initconf.c b/src/initconf.c index 00d78e2..538f344 100644 --- a/src/initconf.c +++ b/src/initconf.c @@ -35,7 +35,7 @@ * * @param key The pointer to the desired location of the new key. */ -void generate_key(gpointer key) +static void generate_key(gpointer key) { gnutls_x509_privkey_generate(*((gnutls_x509_privkey_t *) key), GNUTLS_PK_RSA, 2048, 0); g_thread_exit(0); @@ -43,7 +43,7 @@ void generate_key(gpointer key) /** Simple function that generates a spinner until the mutex is released. */ -void progress_bar(gpointer mutex) +static void progress_bar(gpointer mutex) { const char *spinner = "|/-\\|/-\\"; int i = 0; |