core: rewrite error message sentences

Author: nil0x42

src/config.c

@@ -28,7 +28,7 @@ static void     config_threads(void)
     if (g_conf.threads == 0)
         g_conf.threads = (unsigned int) max_threads;
     else if (g_conf.threads > (unsigned int) max_threads)
-        error("Cannot use more than %ld threads", max_threads);
+        error("cannot use more than %ld threads", max_threads);
 }
 
 

src/dedupe.c

@@ -26,7 +26,7 @@ static void     tag_subchunks(threadpool thpool, const t_chunk *parent)
     {
         heap_chunk = malloc(sizeof(t_chunk));
         if (heap_chunk == NULL)
-            die("could not malloc() heap_chunk");
+            die("cannot malloc() heap_chunk");
         memcpy(heap_chunk, &chunk, sizeof(t_chunk));
         /* thpool already prints error unless DISABLE_PRINT is defined */
         if (thpool_add_work(thpool, (void*)cleanout_chunk, heap_chunk) != 0)
@@ -77,7 +77,7 @@ static void     tag_subchunks(const t_chunk *parent)
     {
         heap_chunk = malloc(sizeof(t_chunk));
         if (heap_chunk == NULL)
-            die("could not malloc() heap_chunk");
+            die("cannot malloc() heap_chunk");
         memcpy(heap_chunk, &chunk, sizeof(t_chunk));
 
         cleanout_chunk(heap_chunk);

src/hmap.c

@@ -13,11 +13,11 @@ void        init_hmap(size_t size)
     t_line  *area;
 
     if (g_hmap.ptr != NULL)
-        error("create_hmap(): singleton called twice !");
+        error("init_hmap(): singleton called twice !");
 
     area = (t_line*) malloc(size * sizeof(t_line));
     if (area == NULL)
-        error("cannot malloc() hash map: %s", ERRNO);
+        die("cannot malloc() hash map");
 
     g_hmap.ptr = area;
     g_hmap.size = size;
@@ -100,7 +100,7 @@ void        populate_hmap(t_chunk *chunk)
             slot = (slot + 1) % g_hmap.size;
         }
         if (!has_slots)
-            error("populate_hmap(): no space left on hashmap.");
+            error("populate_hmap(): too much slots in use");
         i++;
         if (i == 500000) {
             set_status(TAGDUP_BYTES, (size_t)(chunk->ptr - base_ptr));

src/meminfo.c

@@ -80,7 +80,7 @@ static long long    proc_meminfo(const char *identifier)
     size = BUF_SIZE * sizeof(*buf);
     buf = (char*) malloc(size);
     if (buf == NULL)
-        die("malloc()");
+        die("cannot malloc() proc_meminfo buffer");
 
     result = -1LL;
     identifier_len = strlen(identifier);

src/optparse.c

@@ -245,7 +245,7 @@ void        optparse(int argc, char **argv)
         setopt_help(NULL);
 
     if (g_conf.lowercase_wordlist && g_conf.uppercase_wordlist)
-        error("can't use '--lowercase' and '--uppercase' together");
+        error("cannot use '--lowercase' and '--uppercase' together");
 
     if (g_conf.outfile_name == NULL)
         error("mandatory argument: --outfile");

src/uinput.c

@@ -70,5 +70,5 @@ void        watch_user_input(void)
 
     config_termios();
     if (pthread_create(&tid, NULL, &watch_user_input_worker, NULL) < 0)
-        error("can't create watch_user_input_worker() thread: %s", ERRNO);
+        error("cannot create watch_user_input_worker() thread: %s", ERRNO);
 }

test/tests/user-interface.sh

@@ -21,4 +21,4 @@ set -ve
 ./duplicut /etc/passwd -o /tmp/x -c &> /dev/null
 ./duplicut /etc/passwd -o /tmp/x -C &> /dev/null
 ! ./duplicut /etc/passwd -o /tmp/x -c -C &> /dev/null
-./duplicut /etc/passwd -o /tmp/x -c -C 2>&1 | grep -q "can't use '--lowercase' and '--uppercase' together"
+./duplicut /etc/passwd -o /tmp/x -c -C 2>&1 | grep -q "cannot use '--lowercase' and '--uppercase' together"