aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2015-10-16 14:30:46 +0000
committerNeal H. Walfield <[email protected]>2015-10-16 14:40:40 +0000
commit93e855553eba03f5c31682e0aaf39f18f29860b7 (patch)
tree7a9abab8ba04f6ca3f308f35f7d28d78469c8180
parentcleanup: Fix confusion between gpg_error_t and gpg_err_code_t. (diff)
downloadgnupg-93e855553eba03f5c31682e0aaf39f18f29860b7.tar.gz
gnupg-93e855553eba03f5c31682e0aaf39f18f29860b7.zip
common: Prefix the mkdir functions with gnupg_. Make args const.
* common/mkdir_p.h (mkdir_p): Rename from this... (gnupg_mkdir_p): ... to this. Change directory_component's type from char * to const char *. (amkdir_p): Rename from this... (gnupg_amkdir_p): ... to this. Change directory_component's type from char * to const char *. * common/mkdir_p.c (mkdir_p): Rename from this... (gnupg_mkdir_p): ... to this. Change directory_component's type from char * to const char *. (amkdir_p): Rename from this... (gnupg_amkdir_p): ... to this. Change directory_component's type from char * to const char *. -- Signed-off-by: Neal H. Walfield <[email protected]>.
-rw-r--r--common/mkdir_p.c6
-rw-r--r--common/mkdir_p.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/common/mkdir_p.c b/common/mkdir_p.c
index 42469f8a7..43f9e024c 100644
--- a/common/mkdir_p.c
+++ b/common/mkdir_p.c
@@ -41,7 +41,7 @@
gpg_error_t
-amkdir_p (char **directory_components)
+gnupg_amkdir_p (const char **directory_components)
{
gpg_error_t err = 0;
int count;
@@ -138,7 +138,7 @@ amkdir_p (char **directory_components)
gpg_error_t
-mkdir_p (char *directory_component, ...)
+gnupg_mkdir_p (const char *directory_component, ...)
{
va_list ap;
gpg_error_t err = 0;
@@ -174,7 +174,7 @@ mkdir_p (char *directory_component, ...)
va_end (ap);
if (!err)
- err = amkdir_p (dirs);
+ err = gnupg_amkdir_p (dirs);
xfree (dirs);
diff --git a/common/mkdir_p.h b/common/mkdir_p.h
index 0a6cf3d68..28f38d1d5 100644
--- a/common/mkdir_p.h
+++ b/common/mkdir_p.h
@@ -39,7 +39,7 @@
first try to create the directory "foo/bar" and then the directory
"foo/bar/xyzzy". On success returns 0, otherwise an error code is
returned. */
-gpg_error_t mkdir_p (char *directory_component, ...) GPGRT_ATTR_SENTINEL(0);
+gpg_error_t gnupg_mkdir_p (const char *directory_component, ...) GPGRT_ATTR_SENTINEL(0);
/* Like mkdir_p, but DIRECTORY_COMPONENTS is a NULL terminated
array, e.g.:
@@ -47,6 +47,6 @@ gpg_error_t mkdir_p (char *directory_component, ...) GPGRT_ATTR_SENTINEL(0);
char **dirs = { "foo", "bar", NULL };
amkdir_p (dirs);
*/
-gpg_error_t amkdir_p (char **directory_components);
+gpg_error_t gnupg_amkdir_p (const char **directory_components);
#endif