ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Petr Uzel 2011-02-14 14:43:27 +01:00 committed by Karel Zak
parent 34b2e3f133
commit 70b989c280
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misc-utils/uuidd.c
View File

@ -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);

8
shlibs/uuid/src/gen_uuid.c
View File

@ -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);
}

6
shlibs/uuid/src/uuid.sym
View File

@ -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:
*;
};

4
shlibs/uuid/src/uuidd.h
View File

@ -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 */