From: Laurent MAZET <laurent.mazet@thalesgroup.com>
Date: Fri, 26 Apr 2024 15:39:30 +0000 (+0200)
Subject: fix code
X-Git-Tag: cmore-1.0~36
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=18e7a1ae1e29ecc6c2c435873a8e5ac91a0f629a;p=cmore.git

fix code
---

diff --git a/appli.c b/appli.c
index 9020aad..aa1245e 100644
--- a/appli.c
+++ b/appli.c
@@ -2,10 +2,7 @@
 /* cflags: */
 /* linker: cmd.o tui.o -lpdcurses */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "cmd.h"
 #include "tui.h"
diff --git a/cmd.c b/cmd.c
index c8c9531..66cedd9 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,13 +1,12 @@
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "cmd.h"
 
 #define BUFFERSIZE 4096
 
-static char *_load_file (FILE *fd)
+static char *_read_stream (FILE *sd)
 {
     char *buffer = NULL;
     size_t size = 0;
@@ -15,8 +14,8 @@ static char *_load_file (FILE *fd)
         size += BUFFERSIZE + (size == 0);
         buffer = (char *) realloc (buffer, size);
         memset (buffer + size - BUFFERSIZE - 1, 0, BUFFERSIZE + 1);
-        fread (buffer + size - BUFFERSIZE - 1, 1, BUFFERSIZE, fp);
-    } while (!feof (fp));
+        fread (buffer + size - BUFFERSIZE - 1, 1, BUFFERSIZE, sd);
+    } while (!feof (sd));
 
     return buffer;
 }
@@ -28,7 +27,7 @@ char *exec_cmd (char *cmd)
 
     FILE *fp = popen (cmd, "r");
     if (fp != NULL) {
-        buffer = _load_file (fp);
+        buffer = _read_stream (fp);
         status = pclose(fp);
     }
 
@@ -40,14 +39,14 @@ char *exec_cmd (char *cmd)
     return buffer;
 }
 
-char *load_cmd (char *name)
+char *load_file (char *name)
 {
     int status = -1;
     char *buffer = NULL;
 
     FILE *fd = fopen (name, "r");
     if (fd != NULL) {
-        buffer = _load_file (fd);
+        buffer = _read_stream (fd);
         status = fclose (fd);
     }
 
@@ -61,10 +60,9 @@ char *load_cmd (char *name)
 
 char *read_stdin (void)
 {
-    int status = -1;
     char *buffer = NULL;
 
-    buffer = _load_file (stdin);
+    buffer = _read_stream (stdin);
 
     return buffer;
 }
@@ -102,10 +100,9 @@ char **split_lines (char *buffer, int max)
 void free_lines (char **lines)
 {
     int i = 0;
+
     while (lines[i]) {
         free (lines[i++]);
     }
     free (lines);
-
-    return rc;
 }