[OpenAFS-devel] [PATCH] functions that are supposed to return a value

Joe Buehler jbuehler@hekimian.com
Fri, 14 Nov 2003 08:48:51 -0500


This patch fixes MSVC++ 6 warnings regarding functions that
are supposed to be returning a value.

+ cvs diff -u ./src/viced/host.c
Index: ./src/viced/host.c
===================================================================
RCS file: /cvs/openafs/src/viced/host.c,v
retrieving revision 1.54
diff -u -r1.54 host.c
--- ./src/viced/host.c	8 Aug 2003 21:54:53 -0000	1.54
+++ ./src/viced/host.c	13 Nov 2003 21:20:00 -0000
@@ -87,6 +87,8 @@
      struct client entry[CESPERBLOCK];
  };

+static void h_TossStuff_r(register struct host *host);
+
  /*
   * Make sure the subnet macros have been defined.
   */
@@ -691,7 +693,7 @@
   * To be called, there must be no holds, and either host->deleted
   * or host->clientDeleted must be set.
   */
-int
+static void
  h_TossStuff_r(register struct host *host)
  {
      register struct client **cp, *client;
+ cvs diff -u ./src/butc/lwps.c
Index: ./src/butc/lwps.c
===================================================================
RCS file: /cvs/openafs/src/butc/lwps.c,v
retrieving revision 1.9
diff -u -r1.9 lwps.c
--- ./src/butc/lwps.c	8 Aug 2003 20:01:25 -0000	1.9
+++ ./src/butc/lwps.c	13 Nov 2003 21:20:01 -0000
@@ -402,6 +402,7 @@
          * * notes:
          * *     only external clients are in recoverDb.c. Was static. PA
          */
+void
  FFlushInput()
  {
      int w;
+ cvs diff -u ./src/bucoord/status.c
Index: ./src/bucoord/status.c
===================================================================
RCS file: /cvs/openafs/src/bucoord/status.c,v
retrieving revision 1.6
diff -u -r1.6 status.c
--- ./src/bucoord/status.c	15 Jul 2003 23:14:47 -0000	1.6
+++ ./src/bucoord/status.c	13 Nov 2003 21:20:02 -0000
@@ -71,6 +71,7 @@

  /* general */

+void
  clearStatus(taskId, flags)
       afs_uint32 taskId;
       afs_uint32 flags;
@@ -141,6 +142,7 @@
      return (ptr);
  }

+void
  setStatus(taskId, flags)
       afs_uint32 taskId;
       afs_uint32 flags;
+ cvs diff -u ./src/vlserver/vldb_check.c
Index: ./src/vlserver/vldb_check.c
===================================================================
RCS file: /cvs/openafs/src/vlserver/vldb_check.c,v
retrieving revision 1.9
diff -u -r1.9 vldb_check.c
--- ./src/vlserver/vldb_check.c	15 Jul 2003 23:17:34 -0000	1.9
+++ ./src/vlserver/vldb_check.c	13 Nov 2003 22:49:17 -0000
@@ -921,7 +921,7 @@
      fd = open(dbfile, O_RDONLY, 0);
      if (fd < 0) {
  	printf("can't open file '%s'. error = %d\n", dbfile, errno);
-	return;
+	return 0;
      }

      /* read the ubik header and the vldb database header */
@@ -929,7 +929,7 @@
      readheader(&header);
      if (header.vital_header.vldbversion < 3) {
  	printf("does not support vldb with version less than 3\n");
-	return;
+	return 0;
      }

      maxentries = (header.vital_header.eofPtr / sizeof(vlentry)) + 1;
@@ -1029,6 +1029,7 @@
  		   record[i].type);
  	}
      }
+	return 0;
  }

  main(argc, argv)
+ cvs diff -u ./src/kauth/admin_tools.c
Index: ./src/kauth/admin_tools.c
===================================================================
RCS file: /cvs/openafs/src/kauth/admin_tools.c,v
retrieving revision 1.13
diff -u -r1.13 admin_tools.c
--- ./src/kauth/admin_tools.c	15 Jul 2003 23:15:16 -0000	1.13
+++ ./src/kauth/admin_tools.c	13 Nov 2003 21:20:05 -0000
@@ -1257,7 +1257,7 @@
  MyAfterProc(struct cmd_syndesc *as)
  {
      if (!strcmp(as->name, "help"))
-	return;
+	return 0;

      /* Determine if we need to destory the ubik connection.
       * Closing it avoids resends of packets.
+ cvs diff -u ./src/kauth/kadatabase.c
Index: ./src/kauth/kadatabase.c
===================================================================
RCS file: /cvs/openafs/src/kauth/kadatabase.c,v
retrieving revision 1.8
diff -u -r1.8 kadatabase.c
--- ./src/kauth/kadatabase.c	15 Jul 2003 23:15:16 -0000	1.8
+++ ./src/kauth/kadatabase.c	13 Nov 2003 21:20:05 -0000
@@ -708,6 +708,7 @@

  /* Add a key to the key cache, expanding it if necessary. */

+void
  ka_Encache(name, inst, kvno, key, superseded)
       char *name;
       char *inst;
+ cvs diff -u ./src/ptserver/testpt.c
Index: ./src/ptserver/testpt.c
===================================================================
RCS file: /cvs/openafs/src/ptserver/testpt.c,v
retrieving revision 1.11
diff -u -r1.11 testpt.c
--- ./src/ptserver/testpt.c	15 Jul 2003 23:16:03 -0000	1.11
+++ ./src/ptserver/testpt.c	13 Nov 2003 21:20:07 -0000
@@ -240,6 +240,7 @@
      return y;
  }

+void
  CreateUser(u)
       int u;
  {
@@ -276,9 +277,9 @@
  	ownerUser = id;
  	strcpy(ownerUserName, name);
      }
-    return;
  }

+void
  CreateGroup(g)
       int g;
  {
@@ -345,7 +346,6 @@
  	lastGroup = id;
  	lastGroupPrefix = ownerName;
      }
-    return;
  }

  int
@@ -377,6 +377,7 @@
      return -1;			/* none left */
  }

+void
  AddUser(u, g)
       int u, g;
  {
@@ -398,9 +399,9 @@
  	printf("Adding user (%di) to group (%di)\n", ui, gi);
      population[u * number + g]++;
      nAdds++;
-    return;
  }

+void
  RemUser(u, g)
       int u, g;
  {
@@ -418,7 +419,6 @@
  	printf("Removing user (%di) from group (%di)\n", ui, gi);
      population[u * number + g]--;
      nRems++;
-    return;
  }

  TestManyMembers(as, arock)
+ cvs diff -u ./src/ptserver/pts.c
Index: ./src/ptserver/pts.c
===================================================================
RCS file: /cvs/openafs/src/ptserver/pts.c,v
retrieving revision 1.10
diff -u -r1.10 pts.c
--- ./src/ptserver/pts.c	15 Jul 2003 23:16:02 -0000	1.10
+++ ./src/ptserver/pts.c	13 Nov 2003 21:20:08 -0000
@@ -203,7 +203,7 @@
      }
  #else
      if (!strcmp(as->name, "help"))
-	return;
+	return 0;
      /* Need to shutdown the ubik_client & other connections */
      pr_End();
      rx_Finalize();

-- 
Joe Buehler