Merge pull request #55 from ECP-VeloC/warnings

silence compiler warnings for unused vars
ECP-VeloC · Dec 16, 2023 · f792556 · f792556
2 parents dec4668 + cac2815
commit f792556
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/src/redset_reedsolomon.c b/src/redset_reedsolomon.c
@@ -578,7 +578,6 @@ int redset_reedsolomon_decode(
   size_t chunk_size)
 {
   int i;
-  int j;
 
   int rc = REDSET_SUCCESS;
 
@@ -820,9 +819,6 @@ int redset_recover_rs_rebuild(
     }
   }
 
-  /* size of header as encoded in redundancy file */
-  off_t header_size = 0;
-
   /* exchange headers and open each of our files for reading or writing */
   kvtree* current_hash = NULL;
   kvtree* send_hash = NULL;
@@ -840,9 +836,6 @@ int redset_recover_rs_rebuild(
     /* read in the header */
     kvtree_read_fd(chunk_file, fd_chunk, header);
 
-    /* get offset into file immediately following the header */
-    header_size = lseek(fd_chunk, 0, SEEK_CUR);
-
     /* get file info for this rank */
     current_hash = kvtree_getf(header, "%s %d", REDSET_KEY_COPY_RS_DESC, d->rank);
 
@@ -977,9 +970,6 @@ int redset_recover_rs_rebuild(
 
     /* write chunk file header */
     kvtree_write_fd(chunk_file, fd_chunk, header);
-
-    /* get offset into file immediately following the header */
-    header_size = lseek(fd_chunk, 0, SEEK_CUR);
   }
 
   kvtree_delete(&recv_hash);

diff --git a/src/redset_reedsolomon_pthreads.c b/src/redset_reedsolomon_pthreads.c
@@ -350,7 +350,6 @@ static int reduce_rs_pthread_teardown(threadset_t* tset)
   int ret = REDSET_SUCCESS;
 
   /* signal each thread with 0 work to indicate it should exit */
-  size_t offset = 0;
   for (i = 0; i < tset->num; i++) {
     pthread_mutex_lock(&tset->data[i].mutex);
     tset->data[i].n = 0;
@@ -371,11 +370,10 @@ static int reduce_rs_pthread_teardown(threadset_t* tset)
   }
 
   /* free condition variables and mutexes */
-  int rc;
   for (i = 0; i < tset->num; i++) {
-    rc = pthread_cond_destroy(&tset->data[i].cond_thread);
-    rc = pthread_cond_destroy(&tset->data[i].cond_main);
-    rc = pthread_mutex_destroy(&tset->data[i].mutex);
+    pthread_cond_destroy(&tset->data[i].cond_thread);
+    pthread_cond_destroy(&tset->data[i].cond_main);
+    pthread_mutex_destroy(&tset->data[i].mutex);
   }
 
   /* free memory in data structure */

diff --git a/src/redset_xor_pthreads.c b/src/redset_xor_pthreads.c
@@ -274,7 +274,6 @@ static int reduce_xor_pthread_teardown(threadset_t* tset)
   int ret = REDSET_SUCCESS;
 
   /* signal each thread with 0 work to indicate it should exit */
-  size_t offset = 0;
   for (i = 0; i < tset->num; i++) {
     pthread_mutex_lock(&tset->data[i].mutex);
     tset->data[i].n = 0;
@@ -295,11 +294,10 @@ static int reduce_xor_pthread_teardown(threadset_t* tset)
   }
 
   /* free condition variables and mutexes */
-  int rc;
   for (i = 0; i < tset->num; i++) {
-    rc = pthread_cond_destroy(&tset->data[i].cond_thread);
-    rc = pthread_cond_destroy(&tset->data[i].cond_main);
-    rc = pthread_mutex_destroy(&tset->data[i].mutex);
+    pthread_cond_destroy(&tset->data[i].cond_thread);
+    pthread_cond_destroy(&tset->data[i].cond_main);
+    pthread_mutex_destroy(&tset->data[i].mutex);
   }
 
   /* free memory in data structure */