Fixed a number of complaints about missing return statements.

Some cases were fixed by declaring the function void, others were fixed
by adding a return <value> statement, thereby avoiding potentially
incorrect behavior (usually in error handling).
Some enum correctness in boot.c.

diff --git a/boot/boot.c b/boot/boot.c
index b33b634832e66f6531aaa98cea5e9f5caa57ff07..067dd6233f64ef24584c57d86bbce4479f94098a 100644 (file)
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -726,10 +726,10 @@ char resnames[][6] = {
 /* Using this for all null strings saves a lot of memory. */
 #define null (resnames[0])
 
-int reserved(char *s)
+enum resnames reserved(char *s)
 /* Recognize reserved strings. */
 {
-       int r;
+       enum resnames r;
 
        for (r= R_BOOT; r <= R_UNSET; r++) {
                if (strcmp(s, resnames[r]) == 0) return r;
@@ -1415,6 +1415,7 @@ int exec_bootstrap(void)
                return r;
 
        bootstrap(device, active);
+       return 0;
 }
 
 void boot_device(char *devname)
@@ -1659,7 +1660,7 @@ void execute(void)
 {
        token *second, *third, *fourth, *sep;
        char *name;
-       int res;
+       enum resnames res;
        size_t n= 0;
 
        if (err) {

diff --git a/boot/mkfile.c b/boot/mkfile.c
index bee810f4b556f7287bf627eb32b0d19211fb3e1f..60c06228fe5ac0658006f5bb8703346703184010 100644 (file)
--- a/boot/mkfile.c
+++ b/boot/mkfile.c
@@ -21,7 +21,7 @@ int printf(const char *fmt, ...);
 #define SEEK_END       2
 
 /* Kernel printf requires a putk() function. */
-int putk(int c)
+void putk(int c)
 {
        char ch = c;
 

diff --git a/drivers/dec21140A/dec21140A.c b/drivers/dec21140A/dec21140A.c
index 06d635669e3cb0118f4c5000d6aafe7640497c0a..0308a183a177b5185c030214a64b9a82789b4563 100644 (file)
--- a/drivers/dec21140A/dec21140A.c
+++ b/drivers/dec21140A/dec21140A.c
@@ -85,6 +85,7 @@ int sef_cb_init(int type, sef_init_info_t *info)
     notify(tasknr);
   else if(r != ESRCH)
     printf("%s unable to notify inet: %d\n", str_DevName, r);
+  return r;
 }
 
 /*===========================================================================*

diff --git a/kernel/arch/i386/memory.c b/kernel/arch/i386/memory.c
index 331ae3b0464c7a1c8ac4dde4e32bba8d7168730e..b784e59a1f4d012cff121d7c22b4f7f42c29143e 100644 (file)
--- a/kernel/arch/i386/memory.c
+++ b/kernel/arch/i386/memory.c
@@ -579,7 +579,7 @@ PUBLIC int vm_contiguous(struct proc *targetproc, u32_t vir_buf, size_t bytes)
 /*===========================================================================*
  *                              vm_suspend                                *
  *===========================================================================*/
-PRIVATE int vm_suspend(struct proc *caller, struct proc *target,
+PRIVATE void vm_suspend(struct proc *caller, struct proc *target,
        vir_bytes linaddr, vir_bytes len, int wrflag, int type)
 {
        /* This range is not OK for this process. Set parameters  
@@ -979,7 +979,7 @@ PUBLIC int data_copy_vmcheck(
 /*===========================================================================*
  *                             arch_pre_exec                                *
  *===========================================================================*/
-PUBLIC int arch_pre_exec(struct proc *pr, u32_t ip, u32_t sp)
+PUBLIC void arch_pre_exec(struct proc *pr, u32_t ip, u32_t sp)
 {
 /* wipe extra LDT entries, set program counter, and stack pointer. */
        memset(pr->p_seg.p_ldt + EXTRA_LDT_INDEX, 0,

diff --git a/kernel/proto.h b/kernel/proto.h
index c06c4a1cb951765f10b3825bd53a91e58cd22ffe..79cd21302c569b0f7c53f6f22bbcbb082110ed44 100644 (file)
--- a/kernel/proto.h
+++ b/kernel/proto.h
@@ -151,7 +151,7 @@ _PROTOTYPE( void arch_ack_profile_clock, (void)                             );
 _PROTOTYPE( void do_ser_debug, (void)                                  );
 _PROTOTYPE( int arch_get_params, (char *parm, int max));
 _PROTOTYPE( int arch_set_params, (char *parm, int max));
-_PROTOTYPE( int arch_pre_exec, (struct proc *pr, u32_t, u32_t));
+_PROTOTYPE( void arch_pre_exec, (struct proc *pr, u32_t, u32_t));
 _PROTOTYPE( int arch_umap, (struct proc *pr, vir_bytes, vir_bytes,
        int, phys_bytes *));
 _PROTOTYPE( int arch_do_vmctl, (message *m_ptr, struct proc *p)); 

diff --git a/lib/ansi/ext_comp.c b/lib/ansi/ext_comp.c
index 41ee65dbae3d75158710ef2fa55d81d2dd735688..91ce7750af50275eb2d7c358df04e02ed505f194 100644 (file)
--- a/lib/ansi/ext_comp.c
+++ b/lib/ansi/ext_comp.c
@@ -17,9 +17,9 @@
 #include       <ctype.h>
 
 static int b64_add(struct mantissa *e1, struct mantissa *e2);
-static b64_sft(struct mantissa *e1, int n);
+static void b64_sft(struct mantissa *e1, int n);
 
-static
+static void
 mul_ext(struct EXTEND *e1, struct EXTEND *e2, struct EXTEND *e3)
 {
        /*      Multiply the extended numbers e1 and e2, and put the
@@ -93,7 +93,7 @@ mul_ext(struct EXTEND *e1, struct EXTEND *e2, struct EXTEND *e3)
        }
 }
 
-static
+static void
 add_ext(struct EXTEND *e1, struct EXTEND *e2, struct EXTEND *e3)
 {
        /*      Add two extended numbers e1 and e2, and put the result
@@ -182,7 +182,7 @@ cmp_ext(struct EXTEND *e1, struct EXTEND *e2)
         return 1;
 }
 
-static
+static void
 b64_sft(struct mantissa *e1, int n)
 {
        if (n > 0) {
@@ -435,7 +435,7 @@ static struct EXTEND r_big_ten_powers[] = { /* representation of 10 ** -(28*i) *
 #define BTP    (int)(sizeof(big_ten_powers)/sizeof(big_ten_powers[0]))
 #define MAX_EXP        (TP * BTP - 1)
 
-static
+static void
 add_exponent(struct EXTEND *e, int exp)
 {
        int neg = exp < 0;
@@ -455,7 +455,7 @@ add_exponent(struct EXTEND *e, int exp)
        }
 }
 
-_str_ext_cvt(const char *s, char **ss, struct EXTEND *e)
+void _str_ext_cvt(const char *s, char **ss, struct EXTEND *e)
 {
        /*      Like strtod, but for extended precision */
        register int    c;
@@ -538,7 +538,8 @@ _str_ext_cvt(const char *s, char **ss, struct EXTEND *e)
 
 #include       <math.h>
 
-static
+
+static void
 ten_mult(struct EXTEND *e)
 {
        struct EXTEND e1 = *e;
@@ -696,7 +697,7 @@ _ext_str_cvt(struct EXTEND *e, int ndigit, int *decpt, int *sign, int ecvtflag)
        return buf;
 }
 
-_dbl_ext_cvt(double value, struct EXTEND *e)
+void _dbl_ext_cvt(double value, struct EXTEND *e)
 {
        /*      Convert double to extended
        */

diff --git a/servers/rs/manager.c b/servers/rs/manager.c
index 3d9fbd02fc7fc118201adfae8d668ba3291cc807..6a318157f2c9d04daeeba48bce55bda6d1fc635d 100644 (file)
--- a/servers/rs/manager.c
+++ b/servers/rs/manager.c
@@ -26,7 +26,7 @@ FORWARD _PROTOTYPE( int copy_label, (endpoint_t src_e,
        struct rss_label *src_label, char *dst_label, size_t dst_len) );
 FORWARD _PROTOTYPE( int start_service, (struct rproc *rp, int flags,
        endpoint_t *ep) );
-FORWARD _PROTOTYPE( int stop_service, (struct rproc *rp,int how) );
+FORWARD _PROTOTYPE( void stop_service, (struct rproc *rp,int how) );
 FORWARD _PROTOTYPE( int fork_nb, (void) );
 FORWARD _PROTOTYPE( int read_exec, (struct rproc *rp) );
 FORWARD _PROTOTYPE( int share_exec, (struct rproc *rp_src,
@@ -1329,9 +1329,7 @@ endpoint_t *endpoint;
 /*===========================================================================*
  *                             stop_service                                 *
  *===========================================================================*/
-PRIVATE int stop_service(rp,how)
-struct rproc *rp;
-int how;
+PRIVATE void stop_service(struct rproc *rp,int how)
 {
   /* Try to stop the system service. First send a SIGTERM signal to ask the
    * system service to terminate. If the service didn't install a signal 

diff --git a/servers/vm/map_mem.c b/servers/vm/map_mem.c
index 508dbcb36ebbee8f59a02db35c755b8e19a134ad..5f0f39ee88427efb914df53a8d92c7ec3ed0abce 100644 (file)
--- a/servers/vm/map_mem.c
+++ b/servers/vm/map_mem.c
@@ -134,7 +134,7 @@ PRIVATE void clean_phys_regions(struct vir_region *region,
 /*===========================================================================*
  *                             do_map_memory                                *
  *===========================================================================*/
-PRIVATE int do_map_memory(struct vmproc *vms, struct vmproc *vmd,
+PRIVATE void do_map_memory(struct vmproc *vms, struct vmproc *vmd,
        struct vir_region *vrs, struct vir_region *vrd,
        vir_bytes offset_s, vir_bytes offset_d,
        vir_bytes length, int flag)