Renamed RETRYI macro of rmc to RMC_RETRYI

h/rmc.h

@@ -17,7 +17,6 @@
 
 #include "osdep.h"
 #include "rmc_constants.h"
-#define	RETRYI	60
 #define	LOGBUFSZ 1024
 
 int rmclogit(const char *const func, const char *const msg, ...);

h/rmc_constants.h

@@ -20,6 +20,7 @@
 #define RMC_REQBUFSZ 256    /* must be >= max media changer server request size */
 #define RMC_MAGIC	0x120D0301
 #define RMC_TIMEOUT	5	/* netread timeout while receiving a request */
+#define	RMC_RETRYI	60
 
 #define RMC_PORT 5014
 

rmc/rmc_dismount.c

@@ -54,6 +54,6 @@ int rmc_dismount(
 
         while ((c = send2rmc (server, sendbuf, msglen, repbuf, sizeof(repbuf))) &&
             serrno == ERMCNACT)
-                sleep (RETRYI);
+                sleep (RMC_RETRYI);
 	return (c);
 }

rmc/rmc_export.c

@@ -47,6 +47,6 @@ int rmc_export(const char *const server, const char *const vid)
 
         while ((c = send2rmc (server, sendbuf, msglen, repbuf, sizeof(repbuf))) &&
             serrno == ERMCNACT)
-                sleep (RETRYI);
+                sleep (RMC_RETRYI);
 	return (c);
 }

rmc/rmc_find_cartridge.c

@@ -60,7 +60,7 @@ int rmc_find_cartridge(
 
         while ((c = send2rmc (server, sendbuf, msglen, repbuf, sizeof(repbuf))) &&
             serrno == ERMCNACT)
-                sleep (RETRYI);
+                sleep (RMC_RETRYI);
 	if (c == 0) {
 		rbp = repbuf;
 		unmarshall_LONG (rbp, c);

rmc/rmc_get_geometry.c

@@ -50,7 +50,7 @@ int rmc_get_geometry(
 
         while ((c = send2rmc (server, sendbuf, msglen, repbuf, sizeof(repbuf))) &&
             serrno == ERMCNACT)
-                sleep (RETRYI);
+                sleep (RMC_RETRYI);
 	if (c == 0) {
 		rbp = repbuf;
         	unmarshall_STRING (rbp, robot_info->inquiry);

rmc/rmc_import.c

@@ -48,6 +48,6 @@ int rmc_import(const char *const server, const char *const vid)
 
         while ((c = send2rmc (server, sendbuf, msglen, repbuf, sizeof(repbuf))) &&
             serrno == ERMCNACT)
-                sleep (RETRYI);
+                sleep (RMC_RETRYI);
 	return (c);
 }

rmc/rmc_mount.c

@@ -54,6 +54,6 @@ int rmc_mount(
 
         while ((c = send2rmc (server, sendbuf, msglen, repbuf, sizeof(repbuf))) &&
             serrno == ERMCNACT)
-                sleep (RETRYI);
+                sleep (RMC_RETRYI);
 	return (c);
 }

rmc/rmc_read_elem_status.c

@@ -58,7 +58,7 @@ int rmc_read_elem_status(
 
         while ((c = send2rmc (server, sendbuf, msglen, repbuf, sizeof(repbuf))) &&
             serrno == ERMCNACT)
-                sleep (RETRYI);
+                sleep (RMC_RETRYI);
 	if (c == 0) {
 		rbp = repbuf;
 		unmarshall_LONG (rbp, c);