First cleanup of rmc fo warnings. Still some undefined functions coming from the tape part

mediachanger/castorrmc/rmc/rmc_dismount.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_dismount.c,v $ $Revision: 1.2 $ $Date: 2002/12/03 06:45:28 $ CERN IT-DS/HSM Jean-Philippe Baud";
-#endif /* not lint */
-
 /*      rmc_dismount - dismount a cartridge from a drive */
 
 #include <stdlib.h>
@@ -21,7 +17,7 @@ static char sccsid[] = "@(#)$RCSfile: rmc_dismount.c,v $ $Revision: 1.2 $ $Date:
 #include "rmc.h"
 #include "rmc_api.h"
 #include "serrno.h"
-rmc_dismount(server, smc_ldr, vid, drvord, force)
+int rmc_dismount(server, smc_ldr, vid, drvord, force)
 char *server;
 char *smc_ldr;
 char *vid;

mediachanger/castorrmc/rmc/rmc_errmsg.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_errmsg.c,v $ $Revision: 1.3 $ $Date: 2003/09/08 17:22:05 $ CERN IT-PDP/DM Jean-Philippe Baud";
-#endif /* not lint */
-
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -30,7 +26,7 @@ int buflen;
 
 /* rmc_errmsg - send error message to user defined client buffer or to stderr */
 
-rmc_errmsg(char *func, char *msg, ...)
+int rmc_errmsg(char *func, char *msg, ...)
 {
 	va_list args;
 	char prtbuf[PRTBUFSZ];

mediachanger/castorrmc/rmc/rmc_export.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_export.c,v $ $Revision: 1.2 $ $Date: 2002/12/03 06:45:28 $ CERN IT-DS/HSM Jean-Philippe Baud";
-#endif /* not lint */
-
 /*      rmc_export - export/eject a cartridge from the robot */
 #include <stdlib.h>
 #include <sys/types.h>
@@ -20,7 +16,7 @@ static char sccsid[] = "@(#)$RCSfile: rmc_export.c,v $ $Revision: 1.2 $ $Date: 2
 #include "rmc.h"
 #include "rmc_api.h"
 #include "serrno.h"
-rmc_export(server, smc_ldr, vid)
+int rmc_export(server, smc_ldr, vid)
 char *server;
 char *smc_ldr;
 char *vid;

mediachanger/castorrmc/rmc/rmc_find_cartridge.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_find_cartridge.c,v $ $Revision: 1.3 $ $Date: 2003/10/29 12:51:21 $ CERN IT-DS/HSM Jean-Philippe Baud";
-#endif /* not lint */
-
 /*      rmc_find_cartridge - find cartridge(s) in a remote SCSI robot */
 
 #include <stdlib.h>
@@ -21,7 +17,7 @@ static char sccsid[] = "@(#)$RCSfile: rmc_find_cartridge.c,v $ $Revision: 1.3 $
 #include "rmc.h"
 #include "rmc_api.h"
 #include "serrno.h"
-rmc_find_cartridge(server, smc_ldr, template, type, startaddr, nbelem, element_info)
+int rmc_find_cartridge(server, smc_ldr, template, type, startaddr, nbelem, element_info)
 char *server;
 char *smc_ldr;
 char *template;

mediachanger/castorrmc/rmc/rmc_get_geometry.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_get_geometry.c,v $ $Revision: 1.2 $ $Date: 2002/12/03 06:45:28 $ CERN IT-DS/HSM Jean-Philippe Baud";
-#endif /* not lint */
-
 /*      rmc_get_geometry - get the remote SCSI robot geometry */
 
 #include <stdlib.h>
@@ -21,7 +17,7 @@ static char sccsid[] = "@(#)$RCSfile: rmc_get_geometry.c,v $ $Revision: 1.2 $ $D
 #include "rmc.h"
 #include "rmc_api.h"
 #include "serrno.h"
-rmc_get_geometry(server, smc_ldr, robot_info)
+int rmc_get_geometry(server, smc_ldr, robot_info)
 char *server;
 char *smc_ldr;
 struct robot_info *robot_info;

mediachanger/castorrmc/rmc/rmc_import.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_import.c,v $ $Revision: 1.2 $ $Date: 2002/12/03 06:45:28 $ CERN IT-DS/HSM Jean-Philippe Baud";
-#endif /* not lint */
-
 /*      rmc_import - import/inject a cartridge into the robot */
 
 #include <stdlib.h>
@@ -21,7 +17,7 @@ static char sccsid[] = "@(#)$RCSfile: rmc_import.c,v $ $Revision: 1.2 $ $Date: 2
 #include "rmc.h"
 #include "rmc_api.h"
 #include "serrno.h"
-rmc_import(server, smc_ldr, vid)
+int rmc_import(server, smc_ldr, vid)
 char *server;
 char *smc_ldr;
 char *vid;

mediachanger/castorrmc/rmc/rmc_mount.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_mount.c,v $ $Revision: 1.2 $ $Date: 2002/12/03 06:45:28 $ CERN IT-DS/HSM Jean-Philippe Baud";
-#endif /* not lint */
-
 /*      rmc_mount - mount a cartridge on a drive */
 
 #include <stdlib.h>
@@ -21,7 +17,7 @@ static char sccsid[] = "@(#)$RCSfile: rmc_mount.c,v $ $Revision: 1.2 $ $Date: 20
 #include "rmc.h"
 #include "rmc_api.h"
 #include "serrno.h"
-rmc_mount(server, smc_ldr, vid, side, drvord)
+int rmc_mount(server, smc_ldr, vid, side, drvord)
 char *server;
 char *smc_ldr;
 char *vid;

mediachanger/castorrmc/rmc/rmc_procreq.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
  
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_procreq.c,v $ $Revision: 1.3 $ $Date: 2005/07/11 11:36:03 $ CERN IT-PDP/DM Jean-Philippe Baud";
-#endif /* not lint */
- 
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
@@ -74,7 +70,7 @@ char *logbuf;
 	}
 }
 
-marshall_ELEMENT (sbpp, element_info)
+int marshall_ELEMENT (sbpp, element_info)
 char **sbpp;
 struct smc_element_info *element_info;
 {
@@ -94,7 +90,7 @@ struct smc_element_info *element_info;
 
 /*	rmc_srv_export - export/eject a cartridge from the robot */
 
-rmc_srv_export(req_data, clienthost)
+int rmc_srv_export(req_data, clienthost)
 char *req_data;
 char *clienthost;
 {
@@ -136,7 +132,7 @@ char *clienthost;
 
 /*	rmc_srv_findcart - find cartridge(s) */
 
-rmc_srv_findcart(req_data, clienthost)
+int rmc_srv_findcart(req_data, clienthost)
 char *req_data;
 char *clienthost;
 {
@@ -218,7 +214,7 @@ char *clienthost;
 
 /*	rmc_srv_getgeom - get the robot geometry */
 
-rmc_srv_getgeom(req_data, clienthost)
+int rmc_srv_getgeom(req_data, clienthost)
 char *req_data;
 char *clienthost;
 {
@@ -260,7 +256,7 @@ char *clienthost;
 
 /*	rmc_srv_import - import/inject a cartridge into the robot */
 
-rmc_srv_import(req_data, clienthost)
+int rmc_srv_import(req_data, clienthost)
 char *req_data;
 char *clienthost;
 {
@@ -302,7 +298,7 @@ char *clienthost;
 
 /*	rmc_srv_mount - mount a cartridge on a drive */
 
-rmc_srv_mount(req_data, clienthost)
+int rmc_srv_mount(req_data, clienthost)
 char *req_data;
 char *clienthost;
 {
@@ -348,7 +344,7 @@ char *clienthost;
 
 /*	rmc_srv_readelem - read element status */
 
-rmc_srv_readelem(req_data, clienthost)
+int rmc_srv_readelem(req_data, clienthost)
 char *req_data;
 char *clienthost;
 {
@@ -423,7 +419,7 @@ char *clienthost;
 
 /*	rmc_srv_unmount - dismount a cartridge from a drive */
 
-rmc_srv_unmount(req_data, clienthost)
+int rmc_srv_unmount(req_data, clienthost)
 char *req_data;
 char *clienthost;
 {

mediachanger/castorrmc/rmc/rmc_read_elem_status.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_read_elem_status.c,v $ $Revision: 1.2 $ $Date: 2002/12/03 06:45:28 $ CERN IT-DS/HSM Jean-Philippe Baud";
-#endif /* not lint */
-
 /*      rmc_read_elem_status - read element status in a remote SCSI robot */
 
 #include <stdlib.h>
@@ -21,7 +17,7 @@ static char sccsid[] = "@(#)$RCSfile: rmc_read_elem_status.c,v $ $Revision: 1.2
 #include "rmc.h"
 #include "rmc_api.h"
 #include "serrno.h"
-rmc_read_elem_status(server, smc_ldr, type, startaddr, nbelem, element_info)
+int rmc_read_elem_status(server, smc_ldr, type, startaddr, nbelem, element_info)
 char *server;
 char *smc_ldr;
 int type;

mediachanger/castorrmc/rmc/rmc_serv.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmc_serv.c,v $ $Revision: 1.8 $ $Date: 2007/02/13 13:11:55 $ CERN IT-PDP/DM Jean-Philippe Baud";
-#endif /* not lint */
-
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -18,6 +14,8 @@ static char sccsid[] = "@(#)$RCSfile: rmc_serv.c,v $ $Revision: 1.8 $ $Date: 200
 #include <winsock2.h>
 #else
 #include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -29,6 +27,12 @@ static char sccsid[] = "@(#)$RCSfile: rmc_serv.c,v $ $Revision: 1.8 $ $Date: 200
 #include "rmc.h"
 #include "scsictl.h"
 #include "serrno.h"
+#include "rmc_server_api.h"
+#include "Cdomainname.h"
+
+/* Forward declaration */
+int getreq(int, int*, char*, char**);
+void procreq(int, char*, char*);
 
 int being_shutdown;
 char func[16];
@@ -38,14 +42,13 @@ int maxfds;
 struct extended_robot_info extended_robot_info;
 int rpfd;
 
-rmc_main(main_args)
+int rmc_main(main_args)
 struct main_args *main_args;
 {
 	int c;
 	unsigned char cdb[12];
 	void doit(int);
 	char domainname[CA_MAXHOSTNAMELEN+1];
-	struct smc_element_info element_info;
 	struct sockaddr_in from;
 	socklen_t fromlen = sizeof(from);
 	char *getconfent();
@@ -108,8 +111,9 @@ struct main_args *main_args;
 	/* get robot geometry, try 2 times */
    
     while (n < 2) {
-	     if (c = smc_get_geometry (extended_robot_info.smc_fd,
-	        extended_robot_info.smc_ldr, &extended_robot_info.robot_info)) {
+      if ((c = smc_get_geometry (extended_robot_info.smc_fd,
+                                 extended_robot_info.smc_ldr,
+                                 &extended_robot_info.robot_info))) {
             c = smc_lasterror (&smc_status, &msgaddr);
             rmclogit (func, RMC02, "get_geometry", msgaddr);
             rmclogit (func,"trying again get_geometry\n");
@@ -161,7 +165,7 @@ struct main_args *main_args;
 	sin.sin_family = AF_INET ;
 	if ((p = getenv ("RMC_PORT")) || (p = getconfent ("RMC", "PORT", 0))) {
 		sin.sin_port = htons ((unsigned short)atoi (p));
-	} else if (sp = getservbyname ("rmc", "tcp")) {
+	} else if ((sp = getservbyname ("rmc", "tcp"))) {
 		sin.sin_port = sp->s_port;
 	} else {
 		sin.sin_port = htons ((unsigned short)RMC_PORT);
@@ -196,7 +200,7 @@ struct main_args *main_args;
 }
 
 #if ! defined(_WIN32)
-main(argc, argv)
+int main(argc, argv)
 int argc;
 char **argv;
 {
@@ -233,7 +237,7 @@ int rqfd;
 		netclose (rqfd);
 }
 
-getreq(s, req_type, req_data, clienthost)
+int getreq(s, req_type, req_data, clienthost)
 int s;
 int *req_type;
 char *req_data;
@@ -285,7 +289,7 @@ char **clienthost;
 	}
 }
 
-procreq(req_type, req_data, clienthost)
+void procreq(req_type, req_data, clienthost)
 int req_type;
 char *req_data;
 char *clienthost;

mediachanger/castorrmc/rmc/rmclogit.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: rmclogit.c,v $ $Revision: 1.3 $ $Date: 2005/07/11 11:36:58 $ CERN IT-PDP/DM Jean-Philippe Baud";
-#endif /* not lint */
-
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -14,10 +10,11 @@ static char sccsid[] = "@(#)$RCSfile: rmclogit.c,v $ $Revision: 1.3 $ $Date: 200
 #include <sys/types.h>
 #include <time.h>
 #include <stdarg.h>
+#include <unistd.h>
 #include "rmc.h"
 extern int jid;
 
-rmclogit(char *func, char *msg, ...)
+int rmclogit(char *func, char *msg, ...)
 {
 	va_list args;
 	char prtbuf[PRTBUFSZ];

mediachanger/castorrmc/rmc/send2rmc.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: send2rmc.c,v $ $Revision: 1.4 $ $Date: 2003/11/19 12:22:48 $ CERN IT-PDP/DM Jean-Philippe Baud";
-#endif /* not lint */
-
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -14,6 +10,7 @@ static char sccsid[] = "@(#)$RCSfile: send2rmc.c,v $ $Revision: 1.4 $ $Date: 200
 #include <winsock2.h>
 #else
 #include <netdb.h>
+#include <unistd.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #endif
@@ -21,11 +18,12 @@ static char sccsid[] = "@(#)$RCSfile: send2rmc.c,v $ $Revision: 1.4 $ $Date: 200
 #include "marshall.h"
 #include "net.h"
 #include "rmc.h"
+#include "rmc_api.h"
 #include "serrno.h"
 
 /* send2tpd - send a request to the SCSI media changer server and wait for the reply */
 
-send2rmc(host, reqp, reql, user_repbuf, user_repbuf_len)
+int send2rmc(host, reqp, reql, user_repbuf, user_repbuf_len)
 char *host;
 char *reqp;
 int reql;
@@ -53,7 +51,7 @@ int user_repbuf_len;
 	sin.sin_family = AF_INET;
 	if ((p = getenv ("RMC_PORT")) || (p = getconfent ("RMC", "PORT", 0))) {
 		sin.sin_port = htons ((unsigned short)atoi (p));
-	} else if (sp = Cgetservbyname ("rmc", "tcp")) {
+	} else if ((sp = Cgetservbyname ("rmc", "tcp"))) {
 		sin.sin_port = sp->s_port;
 		serrno = 0;
 	} else {

mediachanger/castorrmc/rmc/sendrep.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: sendrep.c,v $ $Revision: 1.3 $ $Date: 2003/09/09 06:20:28 $ CERN IT-PDP/DM Jean-Philippe Baud";
-#endif /* not lint */
-
 #include <errno.h>
 #include <sys/types.h>
 #if defined(_WIN32)
@@ -16,18 +12,17 @@ static char sccsid[] = "@(#)$RCSfile: sendrep.c,v $ $Revision: 1.3 $ $Date: 2003
 #endif
 #include <string.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include "marshall.h"
 #include "net.h"
 #include "rmc.h"
-sendrep(int rpfd, int rep_type, ...)
+int sendrep(int rpfd, int rep_type, ...)
 {
 	va_list args;
 	char func[16];
 	char *msg;
 	int n;
-	char *p;
 	char prtbuf[PRTBUFSZ];
-	char *q;
 	char *rbp;
 	int rc;
 	char repbuf[REPBUFSZ];

mediachanger/castorrmc/rmc/usrmsg.c

@@ -3,10 +3,6 @@
  * All rights reserved
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)$RCSfile: usrmsg.c,v $ $Revision: 1.3 $ $Date: 2005/07/11 11:38:12 $ CERN IT-PDP/DM Jean-Philippe Baud";
-#endif /* not lint */
-
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -14,7 +10,7 @@ static char sccsid[] = "@(#)$RCSfile: usrmsg.c,v $ $Revision: 1.3 $ $Date: 2005/
 #include <stdarg.h>
 #include "rmc.h"
 
-usrmsg(char *func, char *msg, ...)
+int usrmsg(char *func, char *msg, ...)
 {
 	va_list args;
 	char *p;