Tag v33

Missed a 'return' catching an error.

clr_debug_daemon.service

@@ -4,8 +4,6 @@ Description=Clear Linux debuginfo daemon
 [Service]
 Type=simple
 ExecStart=/usr/bin/clr_debug_daemon
-DefaultDependencies=no
-Nice=10
 
 [Install]
 WantedBy=multi-user.target

clr_debug_fuse.service

@@ -5,8 +5,6 @@ After=clr_debug_daemon.service
 [Service]
 Type=simple
 ExecStart=/usr/bin/clr_debug_fuse
-DefaultDependencies=no
-Nice=10
 
 [Install]
 WantedBy=multi-user.target

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.66])
-AC_INIT(clr-debug-info, 38, arjan@linux.intel.com)
+AC_INIT(clr-debug-info, 33, arjan@linux.intel.com)
 AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC

src/nica/files.c

@@ -113,7 +113,7 @@ bool nc_copy_file(const char *src, const char *dst, mode_t mode, bool remove_tar
         while (true) {
                 if ((r = read(src_fd, &buffer, sizeof(buffer))) < 0) {
                         ret = false;
-                        goto end;
+                        break;
                 }
                 if (write(dest_fd, buffer, sizeof(buffer)) != r) {
                         break;

src/nica/hashmap.c

@@ -123,8 +123,8 @@ static inline unsigned nc_hashmap_get_hash(NcHashmap *self, const void *key)
         return hash;
 }
 
-static int nc_hashmap_insert_bucket(NcHashmap *self, NcHashmapEntry *buckets, int n_buckets,
-                                    unsigned hash, const void *key, void *value)
+static bool nc_hashmap_insert_bucket(NcHashmap *self, NcHashmapEntry *buckets, int n_buckets,
+                                     unsigned hash, const void *key, void *value)
 {
         NcHashmapEntry *row = &(buckets[hash % n_buckets]);
         NcHashmapEntry *head = NULL;
@@ -458,12 +458,10 @@ bool nc_hashmap_iter_next(NcHashmapIter *citer, void **key, void **value)
                         }
                         item = &(map->buckets[iter->bucket]);
                 }
-                if (item) {
-                        if (item->occ) {
-                                goto success;
-                        }
-                        item = item->next;
+                if (item && item->occ) {
+                        goto success;
                 }
+                item = item->next;
         }
         return false;
 

src/server.c

@@ -237,7 +237,7 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
                 stat(filename, &statbuf);
                 if (statbuf.st_size > 0 &&
                     asprintf(&command,
-                             "tar -C /var/cache/debuginfo/%s --no-same-owner  --no-same-permissions  -xf %s",
+                             "tar -C /var/cache/debuginfo/%s --no-same-owner  -xf %s",
                              prefix,
                              filename) >= 0) {
                         if (system(command) != 0) {
@@ -282,6 +282,7 @@ static void *server_thread(void *arg)
         if (ret < 0) {
                 goto thread_end;
         }
+        prefix = buf;
         c = strchr(buf, ':');
         if (!c) {
                 goto thread_end;