Renamed rmc REQBUFSZ to RMC_REQBUFSZ

h/rmc.h

@@ -20,7 +20,6 @@
 #define	MAXRETRY 5
 #define	RETRYI	60
 #define	LOGBUFSZ 1024
-#define	REQBUFSZ 256	/* must be >= max media changer server request size */
 #define RMC_MAGIC	0x120D0301
 #define RMC_TIMEOUT	5	/* netread timeout while receiving a request */
 

h/rmc_constants.h

@@ -17,6 +17,7 @@
 #define RMC_CHECKI  5   /* max interval to check for work to be done */
 #define RMC_PRTBUFSZ 180
 #define RMC_REPBUFSZ 524288 /* must be >= max media changer server reply size */
+#define RMC_REQBUFSZ 256    /* must be >= max media changer server request size */
 
 #define RMC_PORT 5014
 

rmc/rmc_dismount.c

@@ -25,7 +25,7 @@ int rmc_dismount(
 	char *q;
 	char repbuf[1];
 	char *sbp;
-	char sendbuf[REQBUFSZ];
+	char sendbuf[RMC_REQBUFSZ];
 	uid_t uid;
 
 	uid = getuid();

rmc/rmc_export.c

@@ -20,7 +20,7 @@ int rmc_export(const char *const server, const char *const vid)
 	char *q;
 	char repbuf[1];
 	char *sbp;
-	char sendbuf[REQBUFSZ];
+	char sendbuf[RMC_REQBUFSZ];
 	uid_t uid;
 
 	uid = getuid();

rmc/rmc_find_cartridge.c

@@ -30,7 +30,7 @@ int rmc_find_cartridge(
 	char *rbp;
 	char repbuf[RMC_REPBUFSZ];
 	char *sbp;
-	char sendbuf[REQBUFSZ];
+	char sendbuf[RMC_REQBUFSZ];
 	uid_t uid;
 
 	uid = getuid();

rmc/rmc_get_geometry.c

@@ -24,7 +24,7 @@ int rmc_get_geometry(
 	char *rbp;
 	char repbuf[64];
 	char *sbp;
-	char sendbuf[REQBUFSZ];
+	char sendbuf[RMC_REQBUFSZ];
 	uid_t uid;
 
 	uid = getuid();

rmc/rmc_import.c

@@ -21,7 +21,7 @@ int rmc_import(const char *const server, const char *const vid)
 	char *q;
 	char repbuf[1];
 	char *sbp;
-	char sendbuf[REQBUFSZ];
+	char sendbuf[RMC_REQBUFSZ];
 	uid_t uid;
 
 	uid = getuid();

rmc/rmc_mount.c

@@ -25,7 +25,7 @@ int rmc_mount(
 	char *q;
 	char repbuf[1];
 	char *sbp;
-	char sendbuf[REQBUFSZ];
+	char sendbuf[RMC_REQBUFSZ];
 	uid_t uid;
 
 	uid = getuid();

rmc/rmc_read_elem_status.c

@@ -29,7 +29,7 @@ int rmc_read_elem_status(
 	char *rbp;
 	char repbuf[RMC_REPBUFSZ];
 	char *sbp;
-	char sendbuf[REQBUFSZ];
+	char sendbuf[RMC_REQBUFSZ];
 	uid_t uid;
 
 	uid = getuid();

rmc/rmc_serv.c

@@ -269,7 +269,7 @@ static void rmc_doit(const int rpfd)
 {
 	int c;
 	char *clienthost;
-	char req_data[REQBUFSZ-3*LONGSIZE];
+	char req_data[RMC_REQBUFSZ-3*LONGSIZE];
 	int req_type = 0;
 
 	if ((c = getreq (rpfd, &req_type, req_data, &clienthost)) == 0)
@@ -307,11 +307,11 @@ static int getreq(
 		unmarshall_LONG (rbp, n);
 		*req_type = n;
 		unmarshall_LONG (rbp, msglen);
-		if (msglen > REQBUFSZ) {
-			rmclogit (func, RMC46, REQBUFSZ);
+		if (msglen > RMC_REQBUFSZ) {
+			rmclogit (func, RMC46, RMC_REQBUFSZ);
                         tl_rmcdaemon.tl_log( &tl_rmcdaemon, 46, 2,
                                              "func"   , TL_MSG_PARAM_STR, "getreq",
-                                             "MaxSize", TL_MSG_PARAM_INT,  REQBUFSZ);                        
+                                             "MaxSize", TL_MSG_PARAM_INT,  RMC_REQBUFSZ);                        
 			return (-1);
 		}
 		l = msglen - sizeof(req_hdr);