Mercurial > hg > cline / file diff

--- a/src/cline.c	Thu Jul 02 10:22:33 2026 +0200
+++ b/src/cline.c	Thu Jul 02 12:44:29 2026 +0200
@@ -81,20 +81,20 @@
     "\n");
 }
 
-static int exit_with_version(settings_t* settings) {
+static int exit_with_version(settings* settings) {
   printf("cline - Version: " VERSION "\n");
-  destroy_settings_t(settings);
+  destroy_settings(settings);
   return 0;
 }
 
-static int exit_with_help(settings_t* settings, int code) {
+static int exit_with_help(settings* settings, int code) {
   printf("cline - Version: " VERSION "\n");
   printHelpText();
-  destroy_settings_t(settings);
+  destroy_settings(settings);
   return code;
 }
 
-static void normalize_excluded_dirs(settings_t *settings) {
+static void normalize_excluded_dirs(settings *settings) {
   /* normalize all paths */
   for (int i = 0 ; i < settings->excludeDirs->count ; i++) {
     char *arg = strdup(settings->excludeDirs->items[i]);
@@ -127,14 +127,14 @@
 int main(int argc, char** argv) {
 
   /* Settings */
-  settings_t *settings = new_settings_t();
+  settings *settings = new_settings();
   if (settings == NULL) {
     fprintf(stderr, "Memory allocation failed.\n");
     return 1;
   }
 
   /* Get arguments */
-  string_list_t *directories = new_string_list_t();
+  string_list *directories = new_string_list();
   if (directories == NULL) {
     fprintf(stderr, "Memory allocation failed.\n");
     return 1;
@@ -300,8 +300,8 @@
 
   /* Compiler regular expressions, if any specified */
   if (!regex_compile_all(settings->regex)) {
-    destroy_string_list_t(directories);
-    destroy_settings_t(settings);
+    destroy_string_list(directories);
+    destroy_settings(settings);
     return 1;
   }
 
@@ -309,7 +309,7 @@
   normalize_excluded_dirs(settings);
 
   /* Scan directories */
-  scanresult_t* result = new_scanresult_t(settings);
+  scanresult* result = new_scanresult(settings);
   const char* result_type = settings->count_chars ? "chars" : "lines";
   bool has_output = false;
   unsigned total = 0;
@@ -318,19 +318,19 @@
   }
   for (unsigned t = 0 ; t < directories->count ; t++) {
     /* Don't waste memory when only the total sum is needed */
-    string_list_t *output = NULL;
+    string_list *output = NULL;
     if (settings->verbose) {
-      output = new_string_list_t();
+      output = new_string_list();
       output->free_item = free;
     }
-    scanDirectory((scanner_t){directories->items[t], 0}, settings, output, result);
+    scanDirectory((scanner){directories->items[t], 0}, settings, output, result);
     total += result->result;
     if (settings->verbose) {
       has_output |= output->count > 0;
       for (int i = 0 ; i < output->count ; i++) {
         printf("%s", output->items[i]);
       }
-      destroy_string_list_t(output);
+      destroy_string_list(output);
       if (directories->count > 1) {
         has_output = true;
         fputs(sepline_single, stdout);
@@ -340,7 +340,7 @@
       }
     }
   }
-  destroy_string_list_t(directories);
+  destroy_string_list(directories);
 
   /* Print result */
   if (settings->verbose) {
@@ -376,8 +376,8 @@
   } else {
     printf("%u", total);
   }
-  destroy_scanresult_t(result);
-  destroy_settings_t(settings);
+  destroy_scanresult(result);
+  destroy_settings(settings);
 
   return 0;
 }