fix warnings

Author: awbcmu

siod/editline.c

@@ -234,11 +234,19 @@ extern int	tgetnum();
 **  TTY input/output functions.
 */
 
+STATIC int writeerr = 0;
+
 void TTYflush()
 {
+    int r;
     if (ScreenCount) {
 	if (el_no_echo == 0)
-	    (void)write(1, Screen, ScreenCount);
+        {
+	    r = write(1, Screen, ScreenCount);
+            /* I don't care about failure to write here, really */
+            /* but to keep the compiler gods happy I'll count the errors */
+            writeerr += ScreenCount - r;
+        }
 	ScreenCount = 0;
     }
 }

siod/siod_est.cc

@@ -191,14 +191,15 @@ static void val_free(LISP val)
     USERVAL(val) = NULL;
 }
 
-static void val_prin1(LISP v, FILE *fd)
+static int val_prin1(LISP v, FILE *fd)
 {
     char b[1024];
     fput_st(fd,"#<");
     fput_st(fd,val(v).type());
     sprintf(b," %p",val(v).internal_ptr());
     fput_st(fd,b);
     fput_st(fd,">");
+    return 0;
 }
 
 static void val_print_string(LISP v, char *tkbuffer)

siod/siodp.h

@@ -28,7 +28,7 @@ extern LISP open_files;
 extern LISP eof_val;
 extern LISP siod_docstrings;
 extern int siod_interactive;
-void sock_acknowledge_error();
+int sock_acknowledge_error();
 extern FILE *fwarn;
 extern LISP unbound_marker;
 extern long gc_kind_copying;
@@ -46,7 +46,7 @@ struct user_type_hooks
  LISP (*gc_mark)(LISP);
  void (*gc_free)(LISP);
  void (*gc_clear)(LISP);
- void (*prin1)(LISP, FILE *);
+    int (*prin1)(LISP, FILE *);
  void (*print_string)(LISP, char *);
  LISP (*leval)(LISP, LISP *, LISP *);
  long (*c_sxhash)(LISP,long);

siod/slib.cc

@@ -139,10 +139,10 @@ LISP unbound_marker = NIL;
 LISP *obarray;
 long obarray_dim = 100;
 struct catch_frame *catch_framep = (struct catch_frame *) NULL;
-void (*repl_puts)(char *) = NULL;
+int (*repl_puts)(char *) = NULL;
 LISP (*repl_read)(void) = NULL;
 LISP (*repl_eval)(LISP) = NULL;
-void (*repl_print)(LISP) = NULL;
+int (*repl_print)(LISP) = NULL;
 repl_getc_fn siod_fancy_getc = f_getc;
 repl_ungetc_fn siod_fancy_ungetc = f_ungetc;
 LISP *inums;
@@ -368,12 +368,18 @@ long repl_driver(long want_sigint,long want_init,struct repl_hooks *h)
  else
    return(repl(h));}
 
-static void ignore_puts(char *st)
-{(void)st;}
+static int ignore_puts(char *st)
+{
+    (void)st;
+    return 0;
+}
 
-static void noprompt_puts(char *st)
-{if (strcmp(st,"> ") != 0)
-   put_st(st);}
+static int noprompt_puts(char *st)
+{
+    if (strcmp(st,"> ") != 0)
+        put_st(st);
+    return 0;
+}
 
 static char *repl_c_string_arg = NULL;
 static long repl_c_string_flag = 0;
@@ -386,13 +392,17 @@ static LISP repl_c_string_read(void)
  repl_c_string_arg = NULL;
  return(read_from_string(get_c_string(s)));}
 
-static void ignore_print(LISP x)
-{(void)x;
- repl_c_string_flag = 1;}
+static int ignore_print(LISP x)
+{
+    (void)x;
+    repl_c_string_flag = 1;
+    return 0;
+}
 
-static void not_ignore_print(LISP x)
+static int not_ignore_print(LISP x)
 {repl_c_string_flag = 1;
- pprint(x);}
+ pprint(x);
+ return 0;}
 
 long repl_c_string(char *str,
 		   long want_sigint,long want_init,long want_print)
@@ -443,34 +453,42 @@ double myruntime(void)
 #endif
 #endif
 
-void set_repl_hooks(void (*puts_f)(char *),
+void set_repl_hooks(int (*puts_f)(char *),
 		    LISP (*read_f)(void),
 		    LISP (*eval_f)(LISP),
-		    void (*print_f)(LISP))
+		    int (*print_f)(LISP))
 {repl_puts = puts_f;
  repl_read = read_f;
  repl_eval = eval_f;
  repl_print = print_f;}
 
-void fput_st(FILE *f,const char *st)
-{long flag;
- if (f != NULL)  /* so we can block warning messages easily */
- {
-     flag = no_interrupt(1);
-     fprintf(f,"%s",st);
-     no_interrupt(flag);
- }
+int fput_st(FILE *f,const char *st)
+{
+    long flag;
+    if (f != NULL)  /* so we can block warning messages easily */
+    {
+        flag = no_interrupt(1);
+        fprintf(f,"%s",st);
+        no_interrupt(flag);
+    }
+    return 0;
 }
 
 void put_st(const char *st)
 {fput_st(stdout,st);}
 
-void grepl_puts(char *st,void (*repl_putss)(char *))
-{if (repl_putss == NULL)
-   {fput_st(fwarn,st);
-    if (fwarn != NULL) fflush(stdout);}
- else
-   (*repl_putss)(st);}
+int grepl_puts(char *st,int (*repl_putss)(char *))
+{
+    if (repl_putss == NULL)
+    {
+        fput_st(fwarn,st);
+        if (fwarn != NULL)
+            fflush(stdout);
+    }
+    else
+        (*repl_putss)(st);
+    return 0;
+}
 
 static void display_backtrace(LISP args)
 {
@@ -1489,7 +1507,7 @@ LISP leval(LISP x,LISP qenv)
         return(x);}}
 
 void set_print_hooks(long type,
-		     void (*prin1)(LISP, FILE *),
+		     int (*prin1)(LISP, FILE *),
 		     void (*print_string)(LISP, char *)
 		     )
 {struct user_type_hooks *p;

siod/slib_file.cc

@@ -333,16 +333,21 @@ LISP fclose_l(LISP p)
  no_interrupt(flag);
  return(NIL);}
 
-static void file_prin1(LISP ptr,FILE *f)
-{char *name;
- name = ptr->storage_as.c_file.name;
- fput_st(f,"#<FILE ");
- sprintf(tkbuffer," %p",(void *)ptr->storage_as.c_file.f);
- fput_st(f,tkbuffer);
- if (name)
-   {fput_st(f," ");
-    fput_st(f,name);}
- fput_st(f,">");}
+static int file_prin1(LISP ptr,FILE *f)
+{
+    char *name;
+    name = ptr->storage_as.c_file.name;
+    fput_st(f,"#<FILE ");
+    sprintf(tkbuffer," %p",(void *)ptr->storage_as.c_file.f);
+    fput_st(f,tkbuffer);
+    if (name)
+    {
+        fput_st(f," ");
+        fput_st(f,name);
+    }
+    fput_st(f,">");
+    return 0;
+}
 
 FILE *get_c_file(LISP p,FILE *deflt)
 {if (NULLP(p) && deflt) return(deflt);

siod/slib_server.cc

@@ -17,6 +17,9 @@ int siod_server_socket = -1;
 
 LISP siod_send_lisp_to_client(LISP x)
 {
+    int r;
+    LISP rx = x;
+    
     // Send x to the client
     if (siod_server_socket == -1)
     {
@@ -40,43 +43,53 @@ LISP siod_send_lisp_to_client(LISP x)
 #ifdef WIN32
 	send(siod_server_socket,"LP\n",3,0);
 #else
-	write(siod_server_socket,"LP\n",3);
+	r = write(siod_server_socket,"LP\n",3);
+        if (r != 3)
+            rx = NIL;
 #endif
 	socket_send_file(siod_server_socket,tmpfile);
 	unlink(tmpfile);
     }
 
-    return x;
+    return rx;
 }
 
-void sock_acknowledge_error()
+int sock_acknowledge_error()
 {
     // Called to let client know if server gets an error
     // Thanks to mcb for pointing out this omission
+    int r = 0;
 
     if (siod_server_socket != -1)
 #ifdef WIN32
 	send(siod_server_socket,"ER\n",3,0);
 #else
-	write(siod_server_socket,"ER\n",3);
+        r = write(siod_server_socket,"ER\n",3);
 #endif
+        return r;
 
 }
 
-static void acknowledge_sock_print(LISP x)
+static int acknowledge_sock_print(LISP x)
 {   // simple return "OK" -- used in server socket mode
+    int r;
 
     siod_send_lisp_to_client(x);
 #ifdef WIN32
     send(siod_server_socket,"OK\n",3,0);
 #else
-    write(siod_server_socket,"OK\n",3);
+    r = write(siod_server_socket,"OK\n",3);
 #endif
+    if (r == 3)
+        return 0;
+    else
+        return -1;
 }
 
-static void ignore_puts(char *x)
+static int ignore_puts(char *x)
 {   
     (void)x;
+    return 0;
 }
 
 long repl_from_socket(int fd)

siod/slib_sys.cc

@@ -52,17 +52,24 @@ static LISP lchdir(LISP args, LISP env)
 {
     (void)env;
     char *home;
+    int r;
 
     if (siod_llength(args) == 0)
     {
 	home = getenv("HOME");
-	chdir(home);
-	return rintern(home);
+	r=chdir(home);
+        if (r==0)
+            return rintern(home);
+        else
+            return NIL;
     }
     else
     {
-	chdir(get_c_string(leval(car(args),env)));
-	return (car(args));
+	r=chdir(get_c_string(leval(car(args),env)));
+        if (r == 0)
+            return (car(args));
+        else
+            return NIL;
     }
 }