hurd-l4 laden/output.c laden/output.h physmem/o...

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/15 14:18:58

Modified files:
        laden          : output.c output.h 
        physmem        : output.c output.h 
        wortel         : output.c output.h 

Log message:
        Add puts and fix printf/putchar prototypes. Patch by Jeroen Dekkers.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/output.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/output.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/output.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/output.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/output.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/output.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: hurd-l4/laden/output.c
diff -u hurd-l4/laden/output.c:1.4 hurd-l4/laden/output.c:1.5
--- hurd-l4/laden/output.c:1.4  Mon Sep  8 10:23:17 2003
+++ hurd-l4/laden/output.c      Mon Sep 15 14:18:58 2003
@@ -82,7 +82,7 @@
 
 
 /* Print the single character CHR on the output device.  */
-void
+int
 putchar (int chr)
 {
   if (!output)
@@ -90,6 +90,20 @@
 
   if (output->putchar)
     (*output->putchar) (chr);
+
+  return 0;
+}
+
+
+int
+puts (const char *str)
+{
+  while (*str != '\0')
+    putchar (*(str++));
+
+  putchar ('\n');
+
+  return 0;
 }
 
 
@@ -130,7 +144,7 @@
 }
   
 
-void
+int
 printf (const char *fmt, ...)
 {
   va_list ap;
@@ -245,4 +259,6 @@
          break;
        }
     }
+
+  return 0;
 }
Index: hurd-l4/laden/output.h
diff -u hurd-l4/laden/output.h:1.3 hurd-l4/laden/output.h:1.4
--- hurd-l4/laden/output.h:1.3  Mon Sep  8 10:23:17 2003
+++ hurd-l4/laden/output.h      Mon Sep 15 14:18:58 2003
@@ -58,9 +58,11 @@
 void output_deinit (void);
 
 /* Print the single character CHR on the output device.  */
-void putchar (int chr);
+int putchar (int chr);
 
-void printf (const char *fmt, ...);
+int puts (const char *str);
+
+int printf (const char *fmt, ...);
 
 /* True if debug mode is enabled.  */
 extern int output_debug;
Index: hurd-l4/physmem/output.c
diff -u hurd-l4/physmem/output.c:1.1 hurd-l4/physmem/output.c:1.2
--- hurd-l4/physmem/output.c:1.1        Tue Sep  9 17:43:12 2003
+++ hurd-l4/physmem/output.c    Mon Sep 15 14:18:58 2003
@@ -34,7 +34,7 @@
 
 
 /* Print the single character CHR on the output device.  */
-void
+int
 putchar (int chr)
 {
   l4_msg_t msg;
@@ -48,6 +48,20 @@
   /* FIXME: Hard coded thread ID.  */
   l4_send (l4_global_id (l4_thread_user_base () + 2, 1));
   /* FIXME: No error handling.  */
+
+  return 0;
+}
+
+
+int
+puts (const char *str)
+{
+  while (*str != '\0')
+    putchar (*(str++));
+
+  putchar ('\n');
+
+  return 0;
 }
 
 
@@ -88,7 +102,7 @@
 }
   
 
-void
+int
 printf (const char *fmt, ...)
 {
   va_list ap;
@@ -203,4 +217,6 @@
          break;
        }
     }
+
+  return 0;
 }
Index: hurd-l4/physmem/output.h
diff -u hurd-l4/physmem/output.h:1.1 hurd-l4/physmem/output.h:1.2
--- hurd-l4/physmem/output.h:1.1        Tue Sep  9 17:43:12 2003
+++ hurd-l4/physmem/output.h    Mon Sep 15 14:18:58 2003
@@ -22,9 +22,11 @@
 #define _OUTPUT_H      1
 
 /* Print the single character CHR on the output device.  */
-void putchar (int chr);
+int putchar (int chr);
 
-void printf (const char *fmt, ...);
+int puts (const char *str);
+
+int printf (const char *fmt, ...);
 
 /* True if debug mode is enabled.  */
 extern int output_debug;
Index: hurd-l4/wortel/output.c
diff -u hurd-l4/wortel/output.c:1.2 hurd-l4/wortel/output.c:1.3
--- hurd-l4/wortel/output.c:1.2 Mon Sep  8 10:40:37 2003
+++ hurd-l4/wortel/output.c     Mon Sep 15 14:18:58 2003
@@ -82,7 +82,7 @@
 
 
 /* Print the single character CHR on the output device.  */
-void
+int
 putchar (int chr)
 {
   if (!output)
@@ -90,6 +90,20 @@
 
   if (output->putchar)
     (*output->putchar) (chr);
+
+  return 0;
+}
+
+
+int
+puts (const char *str)
+{
+  while (*str != '\0')
+    putchar (*(str++));
+
+  putchar ('\n');
+
+  return 0;
 }
 
 
@@ -130,7 +144,7 @@
 }
   
 
-void
+int
 printf (const char *fmt, ...)
 {
   va_list ap;
@@ -245,4 +259,6 @@
          break;
        }
     }
+
+  return 0;
 }
Index: hurd-l4/wortel/output.h
diff -u hurd-l4/wortel/output.h:1.2 hurd-l4/wortel/output.h:1.3
--- hurd-l4/wortel/output.h:1.2 Mon Sep  8 10:40:37 2003
+++ hurd-l4/wortel/output.h     Mon Sep 15 14:18:58 2003
@@ -58,9 +58,11 @@
 void output_deinit (void);
 
 /* Print the single character CHR on the output device.  */
-void putchar (int chr);
+int putchar (int chr);
 
-void printf (const char *fmt, ...);
+int puts (const char *str);
+
+int printf (const char *fmt, ...);
 
 /* True if debug mode is enabled.  */
 extern int output_debug;