From 068fc218c74ee454db806fbd1a233621dada9ae5 Mon Sep 17 00:00:00 2001
From: Steven Murray <murrayc3@cern.ch>
Date: Tue, 1 Oct 2013 07:36:27 +0000
Subject: [PATCH] Renamed PRTBUFSZ of rmc to RMC_PRTBUFSZ
---
mediachanger/castorrmc/h/rmc.h | 2 --
mediachanger/castorrmc/h/rmc_constants.h | 3 +++
mediachanger/castorrmc/rmc/rmc_errmsg.c | 2 +-
mediachanger/castorrmc/rmc/rmc_sendrep.c | 2 +-
mediachanger/castorrmc/rmc/rmc_smcsubr.c | 3 ++-
mediachanger/castorrmc/rmc/rmclogit.c | 2 +-
mediachanger/castorrmc/rmc/send2rmc.c | 2 +-
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/mediachanger/castorrmc/h/rmc.h b/mediachanger/castorrmc/h/rmc.h
index 35d21e61a4..3da36c8048 100644
--- a/mediachanger/castorrmc/h/rmc.h
+++ b/mediachanger/castorrmc/h/rmc.h
@@ -17,11 +17,9 @@
#include "osdep.h"
#include "rmc_constants.h"
-#define RMC_CHECKI 5 /* max interval to check for work to be done */
#define MAXRETRY 5
#define RETRYI 60
#define LOGBUFSZ 1024
-#define PRTBUFSZ 180
#define REPBUFSZ 524288 /* must be >= max media changer server reply size */
#define REQBUFSZ 256 /* must be >= max media changer server request size */
#define RMC_MAGIC 0x120D0301
diff --git a/mediachanger/castorrmc/h/rmc_constants.h b/mediachanger/castorrmc/h/rmc_constants.h
index 9582d8b7f0..ccd9ca9354 100644
--- a/mediachanger/castorrmc/h/rmc_constants.h
+++ b/mediachanger/castorrmc/h/rmc_constants.h
@@ -14,6 +14,9 @@
#define _RMC_CONSTANTS_H
#include "Castor_limits.h"
+#define RMC_CHECKI 5 /* max interval to check for work to be done */
+#define RMC_PRTBUFSZ 180
+
#define RMC_PORT 5014
/* SCSI media changer utilities exit codes */
diff --git a/mediachanger/castorrmc/rmc/rmc_errmsg.c b/mediachanger/castorrmc/rmc/rmc_errmsg.c
index d4f60c5659..ac0da46959 100644
--- a/mediachanger/castorrmc/rmc/rmc_errmsg.c
+++ b/mediachanger/castorrmc/rmc/rmc_errmsg.c
@@ -28,7 +28,7 @@ rmc_seterrbuf(char *buffer,
int rmc_errmsg(char *func, char *msg, ...)
{
va_list args;
- char prtbuf[PRTBUFSZ];
+ char prtbuf[RMC_PRTBUFSZ];
int save_errno;
save_errno = errno;
diff --git a/mediachanger/castorrmc/rmc/rmc_sendrep.c b/mediachanger/castorrmc/rmc/rmc_sendrep.c
index 86944a7085..278c19dd75 100644
--- a/mediachanger/castorrmc/rmc/rmc_sendrep.c
+++ b/mediachanger/castorrmc/rmc/rmc_sendrep.c
@@ -22,7 +22,7 @@ int rmc_sendrep(const int rpfd, const int rep_type, ...)
char func[16];
char *msg;
int n;
- char prtbuf[PRTBUFSZ];
+ char prtbuf[RMC_PRTBUFSZ];
char *rbp;
int rc;
char repbuf[REPBUFSZ];
diff --git a/mediachanger/castorrmc/rmc/rmc_smcsubr.c b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
index 3d556f112a..d1954d2b6e 100644
--- a/mediachanger/castorrmc/rmc/rmc_smcsubr.c
+++ b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
@@ -13,6 +13,7 @@
#include <sys/types.h>
#include "h/Ctape.h"
+#include "h/rmc_constants.h"
#include "h/rmc_sendrep.h"
#include "h/rmc_smcsubr.h"
#include "h/rmc_smcsubr2.h"
@@ -620,7 +621,7 @@ static int rmc_usrmsg(
...)
{
va_list args;
- char prtbuf[PRTBUFSZ];
+ char prtbuf[RMC_PRTBUFSZ];
const int save_errno = errno;
va_start (args, msg);
diff --git a/mediachanger/castorrmc/rmc/rmclogit.c b/mediachanger/castorrmc/rmc/rmclogit.c
index eb21ee376e..99f3fd6568 100644
--- a/mediachanger/castorrmc/rmc/rmclogit.c
+++ b/mediachanger/castorrmc/rmc/rmclogit.c
@@ -17,7 +17,7 @@ extern int jid;
int rmclogit(const char *const func, const char *const msg, ...)
{
va_list args;
- char prtbuf[PRTBUFSZ];
+ char prtbuf[RMC_PRTBUFSZ];
int save_errno;
struct tm *tm;
time_t current_time;
diff --git a/mediachanger/castorrmc/rmc/send2rmc.c b/mediachanger/castorrmc/rmc/send2rmc.c
index 69b265204e..3318b44186 100644
--- a/mediachanger/castorrmc/rmc/send2rmc.c
+++ b/mediachanger/castorrmc/rmc/send2rmc.c
@@ -35,7 +35,7 @@ int send2rmc(
int magic;
int n;
char *p;
- char prtbuf[PRTBUFSZ];
+ char prtbuf[RMC_PRTBUFSZ];
int rep_type;
char repbuf[REPBUFSZ];
char rmchost[CA_MAXHOSTNAMELEN+1];
--
GitLab