[Pkg-gnupg-commit] [gnupg2] 05/241: common: Prefix the mkdir functions with gnupg_. Make args const.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 93e855553eba03f5c31682e0aaf39f18f29860b7
Author: Neal H. Walfield <neal at g10code.com>
Date:   Fri Oct 16 16:30:46 2015 +0200

    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 <neal at g10code.com>.
---
 common/mkdir_p.c | 6 +++---
 common/mkdir_p.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/mkdir_p.c b/common/mkdir_p.c
index 42469f8..43f9e02 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 0a6cf3d..28f38d1 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git