Eliminate unused parameter warnings from Android build

[thirdparty/e2fsprogs.git] / lib / uuid / gen_uuid.c

diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
index 5893aff3c800963c2e885f5c6451836070f8bc43..794c5851ba37394a69e31bbdefc0fbb4d19ff117 100644 (file)
--- a/lib/uuid/gen_uuid.c
+++ b/lib/uuid/gen_uuid.c
@@ -38,6 +38,8 @@
  */
 #define _SVID_SOURCE
 
+#include "config.h"
+
 #ifdef _WIN32
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
@@ -174,8 +176,7 @@ static void get_random_bytes(void *buf, int nbytes)
 {
        int i, n = nbytes, fd = get_random_fd();
        int lose_counter = 0;
-       unsigned char *cp = (unsigned char *) buf;
-       unsigned short tmp_seed[3];
+       unsigned char *cp = buf;
 
        if (fd >= 0) {
                while (n > 0) {
@@ -198,12 +199,16 @@ static void get_random_bytes(void *buf, int nbytes)
        for (cp = buf, i = 0; i < nbytes; i++)
                *cp++ ^= (rand() >> 7) & 0xFF;
 #ifdef DO_JRAND_MIX
-       memcpy(tmp_seed, jrand_seed, sizeof(tmp_seed));
-       jrand_seed[2] = jrand_seed[2] ^ syscall(__NR_gettid);
-       for (cp = buf, i = 0; i < nbytes; i++)
-               *cp++ ^= (jrand48(tmp_seed) >> 7) & 0xFF;
-       memcpy(jrand_seed, tmp_seed,
-              sizeof(jrand_seed)-sizeof(unsigned short));
+       {
+               unsigned short tmp_seed[3];
+
+               memcpy(tmp_seed, jrand_seed, sizeof(tmp_seed));
+               jrand_seed[2] = jrand_seed[2] ^ syscall(__NR_gettid);
+               for (cp = buf, i = 0; i < nbytes; i++)
+                       *cp++ ^= (jrand48(tmp_seed) >> 7) & 0xFF;
+               memcpy(jrand_seed, tmp_seed,
+                      sizeof(jrand_seed) - sizeof(unsigned short));
+       }
 #endif
 
        return;
@@ -321,10 +326,12 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
                state_fd = open("/var/lib/libuuid/clock.txt",
                                O_RDWR|O_CREAT, 0660);
                (void) umask(save_umask);
-               state_f = fdopen(state_fd, "r+");
-               if (!state_f) {
-                       close(state_fd);
-                       state_fd = -1;
+               if (state_fd >= 0) {
+                       state_f = fdopen(state_fd, "r+");
+                       if (!state_f) {
+                               close(state_fd);
+                               state_fd = -1;
+                       }
                }
        }
        fl.l_type = F_WRLCK;
@@ -338,7 +345,6 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
                        if ((errno == EAGAIN) || (errno == EINTR))
                                continue;
                        fclose(state_f);
-                       close(state_fd);
                        state_fd = -1;
                        break;
                }
@@ -396,9 +402,10 @@ try_again:
 
        if (state_fd > 0) {
                rewind(state_f);
-               len = fprintf(state_f, 
+               len = fprintf(state_f,
                              "clock: %04x tv: %016lu %08lu adj: %08d\n",
-                             clock_seq, last.tv_sec, last.tv_usec, adjustment);
+                             clock_seq, last.tv_sec, (long)last.tv_usec,
+                             adjustment);
                fflush(state_f);
                if (ftruncate(state_fd, len) < 0) {
                        fprintf(state_f, "                   \n");
@@ -406,7 +413,10 @@ try_again:
                }
                rewind(state_f);
                fl.l_type = F_UNLCK;
-               fcntl(state_fd, F_SETLK, &fl);
+               if (fcntl(state_fd, F_SETLK, &fl) < 0) {
+                       fclose(state_f);
+                       state_fd = -1;
+               }
        }
 
        *clock_high = clock_reg >> 32;
@@ -415,6 +425,7 @@ try_again:
        return 0;
 }
 
+#if defined(USE_UUIDD) && defined(HAVE_SYS_UN_H)
 static ssize_t read_all(int fd, char *buf, size_t count)
 {
        ssize_t ret;
@@ -465,8 +476,12 @@ static void close_all_fds(void)
                        open("/dev/null", O_RDWR);
        }
 }
+#endif /* defined(USE_UUIDD) && defined(HAVE_SYS_UN_H) */
 
-
+#pragma GCC diagnostic push
+#if !defined(USE_UUIDD) || !defined(HAVE_SYS_UN_H)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
 /*
  * Try using the uuidd daemon to generate the UUID
  *
@@ -481,6 +496,7 @@ static int get_uuid_via_daemon(int op, uuid_t out, int *num)
        ssize_t ret;
        int32_t reply_len = 0, expected = 16;
        struct sockaddr_un srv_addr;
+       struct stat st;
        pid_t pid;
        static const char *uuidd_path = UUIDD_PATH;
        static int access_ret = -2;
@@ -496,6 +512,10 @@ static int get_uuid_via_daemon(int op, uuid_t out, int *num)
                    sizeof(struct sockaddr_un)) < 0) {
                if (access_ret == -2)
                        access_ret = access(uuidd_path, X_OK);
+               if (access_ret == 0)
+                       access_ret = stat(uuidd_path, &st);
+               if (access_ret == 0 && (st.st_mode & (S_ISUID | S_ISGID)) == 0)
+                       access_ret = access(UUIDD_DIR, W_OK);
                if (access_ret == 0 && start_attempts++ < 5) {
                        if ((pid = fork()) == 0) {
                                close_all_fds();
@@ -544,6 +564,7 @@ fail:
 #endif
        return -1;
 }
+#pragma GCC diagnostic pop
 
 void uuid__generate_time(uuid_t out, int *num)
 {