From b6311fa2c6d14d644f8289cb96b5aee862956b61 Mon Sep 17 00:00:00 2001
From: Laurent Mazet <mazet@softndesign.org>
Date: Tue, 28 Feb 2023 15:23:19 +0100
Subject: [PATCH 1/1] clean fprintf

---
 calc.c    |  1 +
 format.c  | 10 ++++----
 parser.c  | 68 +++++++++++++++++++++++++++----------------------------
 program.c |  8 +++----
 4 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/calc.c b/calc.c
index 71bea56..0fdea1f 100644
--- a/calc.c
+++ b/calc.c
@@ -279,6 +279,7 @@ int main (int argc, char *argv[])
         } else {
             memset (buffer, 0, BUFFER_SIZE);
         }
+        fflush (stdout);
     }
 
     free_completion_list (completion_list);
diff --git a/format.c b/format.c
index e6b1fb6..77e3a18 100644
--- a/format.c
+++ b/format.c
@@ -119,22 +119,20 @@ char *itoa (unsigned long value)
 double print (double value)
 {
     if (_obase == 10) {
-        fprintf (stdout, _format ? _format : DEFAULT_FORMAT, value);
+        printf (_format ? _format : DEFAULT_FORMAT, value);
     } else {
-        fprintf (stdout, "%s%s\n", (_prompt) ? _prompt : DEFAULT_PROMPT, itoa ((unsigned int)value));
+        printf ("%s%s\n", (_prompt) ? _prompt : DEFAULT_PROMPT, itoa ((unsigned int)value));
     }
-    fflush (stdout);
     return value;
 }
 
 double printl (double value)
 {
     if (_obase == 10) {
-        fprintf (stdout, _minform ? _minform : DEFAULT_MINFORM, value);
+        printf (_minform ? _minform : DEFAULT_MINFORM, value);
     } else {
-        fprintf (stdout, "%s%s", (_prompt) ? _prompt : DEFAULT_PROMPT, itoa ((unsigned int)value));
+        printf ("%s%s", (_prompt) ? _prompt : DEFAULT_PROMPT, itoa ((unsigned int)value));
     }
-    fflush (stdout);
     return value;
 }
 
diff --git a/parser.c b/parser.c
index 77013e3..0f4e641 100644
--- a/parser.c
+++ b/parser.c
@@ -448,7 +448,7 @@ void print_element (element_t *root, int level)
     }
 
     for (i = 0; i < level; i++) {
-        fprintf (stdout, " ");
+        printf (" ");
     }
 
     switch (root->func) {
@@ -525,13 +525,13 @@ void print_element (element_t *root, int level)
     case Base: func = "Base"; break;
     }
 
-    fprintf (stdout, "Function: %s\n", func);
+    printf ("Function: %s\n", func);
 
     if ((root->func == Val) && (root->ops[0] == NULL)) {
         for (i = 0; i < level; i++) {
-            fprintf (stdout, " ");
+            printf (" ");
         }
-        fprintf (stdout, "value: %f\n", root->value);
+        printf ("value: %f\n", root->value);
     } else {
         for (i = 0; i < root->nbops; i++) {
             print_element (root->ops[i], level + 1);
@@ -584,7 +584,7 @@ double execute_code (element_t **prog, int nbcalls)
 
 void quit (void)
 {
-    fprintf (stdout, "bye\n");
+    printf ("bye\n");
     exit (0);
 }
 
@@ -592,35 +592,35 @@ void quit (void)
 
 void help (void)
 {
-    fprintf (stdout, "calc is a simple calculator\n\n");
-    fprintf (stdout, "arithmetic op.:");
-    fprintf (stdout, " + - * / %% ^\n");
-    fprintf (stdout, "comparison op.:");
-    fprintf (stdout, " == != >= <= > <\n");
-    fprintf (stdout, "logical op.:");
-    fprintf (stdout, " & | !\n");
-    fprintf (stdout, "mathematic func.:");
-    fprintf (stdout, " exp ln log pow sqrt\n");
-    fprintf (stdout, "trigonometric func.:");
-    fprintf (stdout, " acos asin atan cos sin tan\n");
-    fprintf (stdout, "error functions:");
-    fprintf (stdout, " erf erfc\n");
-    fprintf (stdout, "miscellaneous func.:");
-    fprintf (stdout, " abs ceil floor\n");
-    fprintf (stdout, "storage func.:");
-    fprintf (stdout, " clear dec disp inc mem rcl sto\n");
-    fprintf (stdout, "control flow prim.:");
-    fprintf (stdout, " cond print while {} ;\n");
-    fprintf (stdout, "program management:");
-    fprintf (stdout, " arg call del edit ls prog\n");
-    fprintf (stdout, "stack management:");
-    fprintf (stdout, " get len pop push put set show\n");
-    fprintf (stdout, "stack func.:");
-    fprintf (stdout, " max mean med min ord prod sum var\n");
-    fprintf (stdout, "control management:");
-    fprintf (stdout, " base format help quit\n");
-    fprintf (stdout, "constants:");
-    fprintf (stdout, " ans e pi\n");
+    printf ("calc is a simple calculator\n\n");
+    printf ("arithmetic op.:");
+    printf (" + - * / %% ^\n");
+    printf ("comparison op.:");
+    printf (" == != >= <= > <\n");
+    printf ("logical op.:");
+    printf (" & | !\n");
+    printf ("mathematic func.:");
+    printf (" exp ln log pow sqrt\n");
+    printf ("trigonometric func.:");
+    printf (" acos asin atan cos sin tan\n");
+    printf ("error functions:");
+    printf (" erf erfc\n");
+    printf ("miscellaneous func.:");
+    printf (" abs ceil floor\n");
+    printf ("storage func.:");
+    printf (" clear dec disp inc mem rcl sto\n");
+    printf ("control flow prim.:");
+    printf (" cond print while {} ;\n");
+    printf ("program management:");
+    printf (" arg call del edit ls prog\n");
+    printf ("stack management:");
+    printf (" get len pop push put set show\n");
+    printf ("stack func.:");
+    printf (" max mean med min ord prod sum var\n");
+    printf ("control management:");
+    printf (" base format help quit\n");
+    printf ("constants:");
+    printf (" ans e pi\n");
 }
 
 /* format function */
diff --git a/program.c b/program.c
index a178018..b93a90c 100644
--- a/program.c
+++ b/program.c
@@ -132,11 +132,11 @@ double call (int id, int nbargs, element_t **args)
 void list ()
 {
     int i;
-    fprintf (stdout, "programs:");
+    printf ("programs:");
     for (i = 0; i < nb_programs; i++) {
-        fprintf (stdout, " %d", programs[i]->id);
+        printf (" %d", programs[i]->id);
     }
-    fprintf (stdout, "\n");
+    printf ("\n");
 }
 
 void edit (int id)
@@ -153,7 +153,7 @@ void edit (int id)
         free (edit_line);
     }
     edit_line = strdup (programs[n]->string);
-    //fprintf (stdout, "edit: %s\n", programs[n]->string);
+    //printf ("edit: %s\n", programs[n]->string);
 }
 
 void savestring (int id, char *string)
-- 
2.30.2