libuuid: rename uuid__generate_* to __uuid_generate_*

Having uuid_generate_time and uuid__generate_time at
the same time is confusing. These functions are exported,
but not part of the official API (used by uuidd only).

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 145e6d0efb504a45ec89620c8f4f49f96bb822d7..a01cf568f2b10145d85dcacbcd4348b8bb9d1ce0 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -346,7 +346,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
                        break;
                case UUIDD_OP_TIME_UUID:
                        num = 1;
-                       uuid__generate_time(uu, &num);
+                       __uuid_generate_time(uu, &num);
                        if (debug) {
                                uuid_unparse(uu, str);
                                printf(_("Generated time UUID: %s\n"), str);
@@ -356,7 +356,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
                        break;
                case UUIDD_OP_RANDOM_UUID:
                        num = 1;
-                       uuid__generate_random(uu, &num);
+                       __uuid_generate_random(uu, &num);
                        if (debug) {
                                uuid_unparse(uu, str);
                                printf(_("Generated random UUID: %s\n"), str);
@@ -365,7 +365,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
                        reply_len = sizeof(uu);
                        break;
                case UUIDD_OP_BULK_TIME_UUID:
-                       uuid__generate_time(uu, &num);
+                       __uuid_generate_time(uu, &num);
                        if (debug) {
                                uuid_unparse(uu, str);
                                printf(_("Generated time UUID %s and %d "
@@ -383,7 +383,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
                                num = 1000;
                        if (num * UUID_LEN > (int) (sizeof(reply_buf)-sizeof(num)))
                                num = (sizeof(reply_buf)-sizeof(num)) / UUID_LEN;
-                       uuid__generate_random((unsigned char *) reply_buf +
+                       __uuid_generate_random((unsigned char *) reply_buf +
                                              sizeof(num), &num);
                        if (debug) {
                                printf(_("Generated %d UUIDs:\n"), num);

diff --git a/shlibs/uuid/src/gen_uuid.c b/shlibs/uuid/src/gen_uuid.c
index f6231927e7632ebae29bebb6c1bb4983c4c77dc6..535903c97a76eadac991fc59220ad89c30c090cd 100644 (file)
--- a/shlibs/uuid/src/gen_uuid.c
+++ b/shlibs/uuid/src/gen_uuid.c
@@ -566,7 +566,7 @@ static int get_uuid_via_daemon(int op, uuid_t out, int *num)
 }
 #endif
 
-void uuid__generate_time(uuid_t out, int *num)
+void __uuid_generate_time(uuid_t out, int *num)
 {
        static unsigned char node_id[6];
        static int has_init = 0;
@@ -633,11 +633,11 @@ void uuid_generate_time(uuid_t out)
                return;
 #endif
 
-       uuid__generate_time(out, 0);
+       __uuid_generate_time(out, 0);
 }
 
 
-void uuid__generate_random(uuid_t out, int *num)
+void __uuid_generate_random(uuid_t out, int *num)
 {
        uuid_t  buf;
        struct uuid uu;
@@ -665,7 +665,7 @@ void uuid_generate_random(uuid_t out)
        int     num = 1;
        /* No real reason to use the daemon for random uuid's -- yet */
 
-       uuid__generate_random(out, &num);
+       __uuid_generate_random(out, &num);
 }
 
 

diff --git a/shlibs/uuid/src/uuid.sym b/shlibs/uuid/src/uuid.sym
index 05d9f39338bfbbed6e0592bc7029f736c614bb41..eb57c33e6607bdf55563ec0f102a8e10c1098048 100644 (file)
--- a/shlibs/uuid/src/uuid.sym
+++ b/shlibs/uuid/src/uuid.sym
@@ -23,11 +23,11 @@ global:
        uuid_type;
        uuid_variant;
 
-       /* uuid__* this is not part of the official API, this is
+       /* __uuid_* this is not part of the official API, this is
         * uuidd (uuid daemon) specific stuff. Hell.
         */
-       uuid__generate_time;
-       uuid__generate_random;
+       __uuid_generate_time;
+       __uuid_generate_random;
 local:
        *;
 };

diff --git a/shlibs/uuid/src/uuidd.h b/shlibs/uuid/src/uuidd.h
index 68ee0e5c6449c2893dd0b1ddd0a376744f354bb0..fe3b93c7d66de47de3c37e80fd09a2d67dfc8fb0 100644 (file)
--- a/shlibs/uuid/src/uuidd.h
+++ b/shlibs/uuid/src/uuidd.h
@@ -48,7 +48,7 @@
 #define UUIDD_OP_BULK_RANDOM_UUID      5
 #define UUIDD_MAX_OP                   UUIDD_OP_BULK_RANDOM_UUID
 
-extern void uuid__generate_time(uuid_t out, int *num);
-extern void uuid__generate_random(uuid_t out, int *num);
+extern void __uuid_generate_time(uuid_t out, int *num);
+extern void __uuid_generate_random(uuid_t out, int *num);
 
 #endif /* _UUID_UUID_H */