diff --git a/mediachanger/castorrmc/h/rmc.h b/mediachanger/castorrmc/h/rmc.h
deleted file mode 100644
index ffbb697b556f1a6f893984b94c4b53270a29570b..0000000000000000000000000000000000000000
--- a/mediachanger/castorrmc/h/rmc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * $Id: rmc.h,v 1.2 2007/04/19 15:18:19 sponcec3 Exp $
- */
-
-/*
- * Copyright (C) 2001 by CERN/IT/PDP/DM
- * All rights reserved
- */
-
-/*
- */
-
-#ifndef _RMC_H
-#define _RMC_H
-
- /* SCSI media changer server constants */
-
-#include "osdep.h"
-#include "rmc_constants.h"
-
-int rmclogit(const char *const func, const char *const msg, ...);
-
-#endif
diff --git a/mediachanger/castorrmc/h/rmc_logit.h b/mediachanger/castorrmc/h/rmc_logit.h
new file mode 100644
index 0000000000000000000000000000000000000000..607abb6ce569c9fc610a0e4fe12f6b37d9a99a73
--- /dev/null
+++ b/mediachanger/castorrmc/h/rmc_logit.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) 2001 by CERN/IT/PDP/DM
+ * All rights reserved
+ */
+
+#ifndef _RMC_LOGIT_H
+#define _RMC_LOGIT_H 1
+
+int rmc_logit(const char *const func, const char *const msg, ...);
+
+#endif
diff --git a/mediachanger/castorrmc/rmc/Imakefile b/mediachanger/castorrmc/rmc/Imakefile
index 16d7e15df7233182b8abce7889895a0c9616b695..87d518c0750354a75b5ecb1663c6fa106d605f67 100644
--- a/mediachanger/castorrmc/rmc/Imakefile
+++ b/mediachanger/castorrmc/rmc/Imakefile
@@ -11,7 +11,7 @@ include $(CASTOR_ROOT)/tape/Makefile
RMCD_DEPLIBS = DepSharedLibraryTargetName(tape,castortape)
RMCD_LIBS = $(RMCD_DEPLIBS) BuildRPathcastortape
-RMCD_OBJS = rmc_serv.o rmc_procreq.o rmclogit.o rmc_sendrep.o rmc_smcsubr.o
+RMCD_OBJS = rmc_serv.o rmc_procreq.o rmc_logit.o rmc_sendrep.o rmc_smcsubr.o
TapeProgramTarget(rmcd,$(RMCD_OBJS),$(RMCD_DEPLIBS),$(RMCD_LIBS),755)
ADMMANPAGE(rmcd)
TapeMakeDir($(LOGPATH),0755)
diff --git a/mediachanger/castorrmc/rmc/rmc_dismount.c b/mediachanger/castorrmc/rmc/rmc_dismount.c
index 8c24614bfdc7f245844998ac89b29d4ed293f023..6b4690177177747d55dc168dd8ca17e30ca156db 100644
--- a/mediachanger/castorrmc/rmc/rmc_dismount.c
+++ b/mediachanger/castorrmc/rmc/rmc_dismount.c
@@ -9,10 +9,10 @@
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
-#include "marshall.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/marshall.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
int rmc_dismount(
const char *const server,
const char *const vid,
diff --git a/mediachanger/castorrmc/rmc/rmc_errmsg.c b/mediachanger/castorrmc/rmc/rmc_errmsg.c
index ac0da469597b278f0d9c209db22083ddc1467286..9c2342810bf738376b3961fe0a0f6851f59b7e12 100644
--- a/mediachanger/castorrmc/rmc/rmc_errmsg.c
+++ b/mediachanger/castorrmc/rmc/rmc_errmsg.c
@@ -8,7 +8,8 @@
#include <string.h>
#include <stdarg.h>
#include <sys/types.h>
-#include "rmc.h"
+
+#include "h/rmc_constants.h"
static char *errbufp = NULL;
static int errbuflen;
diff --git a/mediachanger/castorrmc/rmc/rmc_export.c b/mediachanger/castorrmc/rmc/rmc_export.c
index ce337e8da1701a927d2c0d1866d29d870c563c39..08bc1ccd03eae32eab5c8e4cdfc48ef761b80961 100644
--- a/mediachanger/castorrmc/rmc/rmc_export.c
+++ b/mediachanger/castorrmc/rmc/rmc_export.c
@@ -8,10 +8,10 @@
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
-#include "marshall.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/marshall.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
int rmc_export(const char *const server, const char *const vid)
{
int c;
diff --git a/mediachanger/castorrmc/rmc/rmc_find_cartridge.c b/mediachanger/castorrmc/rmc/rmc_find_cartridge.c
index 8336235d334fad14d0977007e46cc841d3d24a17..8728ba2f4e1dd0285d06f85beaceb08896ddf12c 100644
--- a/mediachanger/castorrmc/rmc/rmc_find_cartridge.c
+++ b/mediachanger/castorrmc/rmc/rmc_find_cartridge.c
@@ -9,10 +9,10 @@
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
-#include "marshall.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/marshall.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
int rmc_find_cartridge(
const char *const server,
const char *const pattern,
diff --git a/mediachanger/castorrmc/rmc/rmc_get_geometry.c b/mediachanger/castorrmc/rmc/rmc_get_geometry.c
index e6014d6b178c001b189b32c39adbb6ba41f9e5fa..16f7e42f5c57ed7f94ae8636bcd92aac904593e4 100644
--- a/mediachanger/castorrmc/rmc/rmc_get_geometry.c
+++ b/mediachanger/castorrmc/rmc/rmc_get_geometry.c
@@ -9,10 +9,10 @@
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
-#include "marshall.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/marshall.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
int rmc_get_geometry(
const char *const server,
struct robot_info *const robot_info)
diff --git a/mediachanger/castorrmc/rmc/rmc_import.c b/mediachanger/castorrmc/rmc/rmc_import.c
index 9885f5654ece1356757eec961760eaca08493142..bc0d20e3ab2ba984a4ad2c6f65f004105d86d379 100644
--- a/mediachanger/castorrmc/rmc/rmc_import.c
+++ b/mediachanger/castorrmc/rmc/rmc_import.c
@@ -9,10 +9,10 @@
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
-#include "marshall.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/marshall.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
int rmc_import(const char *const server, const char *const vid)
{
int c;
diff --git a/mediachanger/castorrmc/rmc/rmclogit.c b/mediachanger/castorrmc/rmc/rmc_logit.c
similarity index 88%
rename from mediachanger/castorrmc/rmc/rmclogit.c
rename to mediachanger/castorrmc/rmc/rmc_logit.c
index 99f3fd65689554bc0c775d5e200e2d8de3fec22b..76054ebbaa593bccc74ec6c1c7a20277fa2c92bd 100644
--- a/mediachanger/castorrmc/rmc/rmclogit.c
+++ b/mediachanger/castorrmc/rmc/rmc_logit.c
@@ -11,10 +11,11 @@
#include <time.h>
#include <stdarg.h>
#include <unistd.h>
-#include "h/rmc.h"
+#include "h/rmc_constants.h"
+#include "h/rmc_logit.h"
extern int jid;
-int rmclogit(const char *const func, const char *const msg, ...)
+int rmc_logit(const char *const func, const char *const msg, ...)
{
va_list args;
char prtbuf[RMC_PRTBUFSZ];
diff --git a/mediachanger/castorrmc/rmc/rmc_mount.c b/mediachanger/castorrmc/rmc/rmc_mount.c
index ac910ab52f12808e3b77a1c6eb0d8f2ec1e503c0..aa72260c325419e5dac143eca669ec7383e84b87 100644
--- a/mediachanger/castorrmc/rmc/rmc_mount.c
+++ b/mediachanger/castorrmc/rmc/rmc_mount.c
@@ -9,10 +9,10 @@
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
-#include "marshall.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/marshall.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
int rmc_mount(
const char *const server,
const char *const vid,
diff --git a/mediachanger/castorrmc/rmc/rmc_procreq.c b/mediachanger/castorrmc/rmc/rmc_procreq.c
index 32371dfb13fda769a0338ba2b13a46dd6ef8f140..a8258ce42924248d6200a4521a32cfd00b4c2373 100644
--- a/mediachanger/castorrmc/rmc/rmc_procreq.c
+++ b/mediachanger/castorrmc/rmc/rmc_procreq.c
@@ -14,8 +14,9 @@
#include <netinet/in.h>
#include "h/Cupv_api.h"
#include "h/marshall.h"
-#include "h/rmc.h"
#include "h/serrno.h"
+#include "h/rmc_constants.h"
+#include "h/rmc_logit.h"
#include "h/rmc_smcsubr.h"
#include "h/rmc_smcsubr2.h"
#include "h/rmc_sendrep.h"
@@ -46,7 +47,7 @@ static void rmc_logreq(const char *const func, char *const logbuf)
savechrs1[1] = *(p + n1 + 1);
*(p + n1) = '\\';
*(p + n1 + 1) = '\0';
- rmclogit (func, RMC98, p);
+ rmc_logit (func, RMC98, p);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 98, 2,
"func" , TL_MSG_PARAM_STR, "rmc_logreq",
"Request", TL_MSG_PARAM_STR, p );
@@ -63,7 +64,7 @@ static void rmc_logreq(const char *const func, char *const logbuf)
*(p + 3) = savechrs1[1];
n2 -= n1;
}
- rmclogit (func, RMC98, p);
+ rmc_logit (func, RMC98, p);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 98, 2,
"func" , TL_MSG_PARAM_STR, "rmc_logreq",
"Request", TL_MSG_PARAM_STR, p );
@@ -109,7 +110,7 @@ int rmc_srv_export(
rbp = req_data;
unmarshall_LONG (rbp, uid);
unmarshall_LONG (rbp, gid);
- rmclogit (func, RMC92, "export", uid, gid, clienthost);
+ rmc_logit (func, RMC92, "export", uid, gid, clienthost);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 92, 5,
"func" , TL_MSG_PARAM_STR, "rmc_srv_export",
"Type" , TL_MSG_PARAM_STR, "export",
@@ -121,13 +122,13 @@ int rmc_srv_export(
char smc_ldr[CA_MAXRBTNAMELEN+1];
if (unmarshall_STRINGN (rbp, smc_ldr, CA_MAXRBTNAMELEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "loader");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
}
if (unmarshall_STRINGN (rbp, vid, CA_MAXVIDLEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "vid");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
snprintf (logbuf, CA_MAXVIDLEN+8, "export %s", vid);
@@ -135,13 +136,13 @@ int rmc_srv_export(
if (Cupv_check (uid, gid, clienthost, localhost, P_TAPE_OPERATOR)) {
rmc_sendrep (rpfd, MSG_ERR, "%s\n", sstrerror(serrno));
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
c = smc_export (rpfd, extended_robot_info.smc_fd,
extended_robot_info.smc_ldr, &extended_robot_info.robot_info, vid);
if (c) c += ERMCRBTERR;
- rmclogit (func, "returns %d\n", c);
+ rmc_logit (func, "returns %d\n", c);
return c;
}
@@ -174,7 +175,7 @@ int rmc_srv_findcart(
rbp = req_data;
unmarshall_LONG (rbp, uid);
unmarshall_LONG (rbp, gid);
- rmclogit (func, RMC92, "findcart", uid, gid, clienthost);
+ rmc_logit (func, RMC92, "findcart", uid, gid, clienthost);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 92, 5,
"func" , TL_MSG_PARAM_STR, "rmc_srv_findcart",
"Type" , TL_MSG_PARAM_STR, "findcart",
@@ -186,13 +187,13 @@ int rmc_srv_findcart(
char smc_ldr[CA_MAXRBTNAMELEN+1];
if (unmarshall_STRINGN (rbp, smc_ldr, CA_MAXRBTNAMELEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "loader");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
}
if (unmarshall_STRINGN (rbp, template, 40)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "template");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
unmarshall_LONG (rbp, type);
@@ -203,12 +204,12 @@ int rmc_srv_findcart(
if (nbelem < 1) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "nbelem");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
if ((element_info = malloc (nbelem * sizeof(struct smc_element_info))) == NULL) {
rmc_sendrep (rpfd, MSG_ERR, RMC05);
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
if (extended_robot_info.smc_support_voltag)
@@ -224,13 +225,13 @@ int rmc_srv_findcart(
free (element_info);
rmc_sendrep (rpfd, MSG_ERR, RMC02, "smc_find_cartridge", msgaddr);
c += ERMCRBTERR;
- rmclogit (func, "returns %d\n", c);
+ rmc_logit (func, "returns %d\n", c);
return c;
}
if ((repbuf = malloc (c * 18 + 4)) == NULL) {
rmc_sendrep (rpfd, MSG_ERR, RMC05);
free (element_info);
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
sbp = repbuf;
@@ -240,7 +241,7 @@ int rmc_srv_findcart(
free (element_info);
rmc_sendrep (rpfd, MSG_DATA, sbp - repbuf, repbuf);
free (repbuf);
- rmclogit (func, "returns %d\n", 0);
+ rmc_logit (func, "returns %d\n", 0);
return 0;
}
@@ -263,7 +264,7 @@ int rmc_srv_getgeom(
rbp = req_data;
unmarshall_LONG (rbp, uid);
unmarshall_LONG (rbp, gid);
- rmclogit (func, RMC92, "getgeom", uid, gid, clienthost);
+ rmc_logit (func, RMC92, "getgeom", uid, gid, clienthost);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 92, 5,
"func" , TL_MSG_PARAM_STR, "rmc_srv_getgeom",
"Type" , TL_MSG_PARAM_STR, "getgeom",
@@ -275,7 +276,7 @@ int rmc_srv_getgeom(
char smc_ldr[CA_MAXRBTNAMELEN+1];
if (unmarshall_STRINGN (rbp, smc_ldr, CA_MAXRBTNAMELEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "loader");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
}
@@ -293,7 +294,7 @@ int rmc_srv_getgeom(
marshall_LONG (sbp, extended_robot_info.robot_info.device_start);
marshall_LONG (sbp, extended_robot_info.robot_info.device_count);
rmc_sendrep (rpfd, MSG_DATA, sbp - repbuf, repbuf);
- rmclogit (func, "returns %d\n", 0);
+ rmc_logit (func, "returns %d\n", 0);
return 0;
}
@@ -316,7 +317,7 @@ int rmc_srv_import(
rbp = req_data;
unmarshall_LONG (rbp, uid);
unmarshall_LONG (rbp, gid);
- rmclogit (func, RMC92, "import", uid, gid, clienthost);
+ rmc_logit (func, RMC92, "import", uid, gid, clienthost);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 92, 5,
"func" , TL_MSG_PARAM_STR, "rmc_srv_import",
"Type" , TL_MSG_PARAM_STR, "import",
@@ -328,13 +329,13 @@ int rmc_srv_import(
char smc_ldr[CA_MAXRBTNAMELEN+1];
if (unmarshall_STRINGN (rbp, smc_ldr, CA_MAXRBTNAMELEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "loader");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
}
if (unmarshall_STRINGN (rbp, vid, CA_MAXVIDLEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "vid");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
snprintf (logbuf, CA_MAXVIDLEN+8, "import %s", vid);
@@ -342,13 +343,13 @@ int rmc_srv_import(
if (Cupv_check (uid, gid, clienthost, localhost, P_TAPE_OPERATOR)) {
rmc_sendrep (rpfd, MSG_ERR, "%s\n", sstrerror(serrno));
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
c = smc_import (rpfd, extended_robot_info.smc_fd,
extended_robot_info.smc_ldr, &extended_robot_info.robot_info, vid);
if (c) c += ERMCRBTERR;
- rmclogit (func, "returns %d\n", c);
+ rmc_logit (func, "returns %d\n", c);
return c;
}
@@ -373,7 +374,7 @@ int rmc_srv_mount(
rbp = req_data;
unmarshall_LONG (rbp, uid);
unmarshall_LONG (rbp, gid);
- rmclogit (func, RMC92, "mount", uid, gid, clienthost);
+ rmc_logit (func, RMC92, "mount", uid, gid, clienthost);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 92, 5,
"func" , TL_MSG_PARAM_STR, "rmc_srv_mount",
"Type" , TL_MSG_PARAM_STR, "mount",
@@ -385,13 +386,13 @@ int rmc_srv_mount(
char smc_ldr[CA_MAXRBTNAMELEN+1];
if (unmarshall_STRINGN (rbp, smc_ldr, CA_MAXRBTNAMELEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "loader");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
}
if (unmarshall_STRINGN (rbp, vid, CA_MAXVIDLEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "vid");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
unmarshall_WORD (rbp, invert);
@@ -401,14 +402,14 @@ int rmc_srv_mount(
if (Cupv_check (uid, gid, clienthost, localhost, P_TAPE_SYSTEM)) {
rmc_sendrep (rpfd, MSG_ERR, "%s\n", sstrerror(serrno));
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
c = smc_mount (rpfd, extended_robot_info.smc_fd,
extended_robot_info.smc_ldr, &extended_robot_info.robot_info, drvord,
vid, invert);
if (c) c += ERMCRBTERR;
- rmclogit (func, "returns %d\n", c);
+ rmc_logit (func, "returns %d\n", c);
return c;
}
@@ -440,7 +441,7 @@ int rmc_srv_readelem(
rbp = req_data;
unmarshall_LONG (rbp, uid);
unmarshall_LONG (rbp, gid);
- rmclogit (func, RMC92, "readelem", uid, gid, clienthost);
+ rmc_logit (func, RMC92, "readelem", uid, gid, clienthost);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 92, 5,
"func" , TL_MSG_PARAM_STR, "rmc_srv_readelem",
"Type" , TL_MSG_PARAM_STR, "readelem",
@@ -452,7 +453,7 @@ int rmc_srv_readelem(
char smc_ldr[CA_MAXRBTNAMELEN+1];
if (unmarshall_STRINGN (rbp, smc_ldr, CA_MAXRBTNAMELEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "loader");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
}
@@ -464,17 +465,17 @@ int rmc_srv_readelem(
if (type < 0 || type > 4) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "type");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
if (nbelem < 1) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "nbelem");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
if ((element_info = malloc (nbelem * sizeof(struct smc_element_info))) == NULL) {
rmc_sendrep (rpfd, MSG_ERR, RMC05);
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
if ((c = smc_read_elem_status (extended_robot_info.smc_fd,
@@ -484,13 +485,13 @@ int rmc_srv_readelem(
free (element_info);
rmc_sendrep (rpfd, MSG_ERR, RMC02, "smc_read_elem_status", msgaddr);
c += ERMCRBTERR;
- rmclogit (func, "returns %d\n", c);
+ rmc_logit (func, "returns %d\n", c);
return c;
}
if ((repbuf = malloc (c * 18 + 4)) == NULL) {
rmc_sendrep (rpfd, MSG_ERR, RMC05);
free (element_info);
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
sbp = repbuf;
@@ -500,7 +501,7 @@ int rmc_srv_readelem(
free (element_info);
rmc_sendrep (rpfd, MSG_DATA, sbp - repbuf, repbuf);
free (repbuf);
- rmclogit (func, "returns %d\n", 0);
+ rmc_logit (func, "returns %d\n", 0);
return 0;
}
@@ -525,7 +526,7 @@ int rmc_srv_unmount(
rbp = req_data;
unmarshall_LONG (rbp, uid);
unmarshall_LONG (rbp, gid);
- rmclogit (func, RMC92, "unmount", uid, gid, clienthost);
+ rmc_logit (func, RMC92, "unmount", uid, gid, clienthost);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 92, 5,
"func" , TL_MSG_PARAM_STR, "rmc_srv_unmount",
"Type" , TL_MSG_PARAM_STR, "unmount",
@@ -537,13 +538,13 @@ int rmc_srv_unmount(
char smc_ldr[CA_MAXRBTNAMELEN+1];
if (unmarshall_STRINGN (rbp, smc_ldr, CA_MAXRBTNAMELEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "loader");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
}
if (unmarshall_STRINGN (rbp, vid, CA_MAXVIDLEN+1)) {
rmc_sendrep (rpfd, MSG_ERR, RMC06, "vid");
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
unmarshall_WORD (rbp, drvord);
@@ -553,13 +554,13 @@ int rmc_srv_unmount(
if (Cupv_check (uid, gid, clienthost, localhost, P_TAPE_SYSTEM)) {
rmc_sendrep (rpfd, MSG_ERR, "%s\n", sstrerror(serrno));
- rmclogit (func, "returns %d\n", ERMCUNREC);
+ rmc_logit (func, "returns %d\n", ERMCUNREC);
return ERMCUNREC;
}
c = smc_dismount (rpfd, extended_robot_info.smc_fd,
extended_robot_info.smc_ldr, &extended_robot_info.robot_info, drvord,
force == 0 ? vid : "");
if (c) c += ERMCRBTERR;
- rmclogit (func, "returns %d\n", c);
+ rmc_logit (func, "returns %d\n", c);
return c;
}
diff --git a/mediachanger/castorrmc/rmc/rmc_read_elem_status.c b/mediachanger/castorrmc/rmc/rmc_read_elem_status.c
index 03513b5d8d6721965eace4152c4b8dcd86915a70..551c256b827ba9b1edf7457ce1da495ae05bf0eb 100644
--- a/mediachanger/castorrmc/rmc/rmc_read_elem_status.c
+++ b/mediachanger/castorrmc/rmc/rmc_read_elem_status.c
@@ -9,10 +9,10 @@
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
-#include "marshall.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/marshall.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
int rmc_read_elem_status(
const char *const server,
const int type,
diff --git a/mediachanger/castorrmc/rmc/rmc_sendrep.c b/mediachanger/castorrmc/rmc/rmc_sendrep.c
index 4a667fc43fbf6727ec6e15a130f897d3377a18b6..eefee63be6fbeaa655565ed985c1dcd17fa6eee3 100644
--- a/mediachanger/castorrmc/rmc/rmc_sendrep.c
+++ b/mediachanger/castorrmc/rmc/rmc_sendrep.c
@@ -11,7 +11,8 @@
#include <stdio.h>
#include "h/marshall.h"
#include "h/net.h"
-#include "h/rmc.h"
+#include "h/rmc_constants.h"
+#include "h/rmc_logit.h"
#include "h/rmc_sendrep.h"
#include "h/tplogger_api.h"
#include <unistd.h>
@@ -40,7 +41,7 @@ int rmc_sendrep(const int rpfd, const int rep_type, ...)
vsprintf (prtbuf, msg, args);
marshall_LONG (rbp, strlen (prtbuf) + 1);
marshall_STRING (rbp, prtbuf);
- rmclogit (func, "%s", prtbuf);
+ rmc_logit (func, "%s", prtbuf);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 103, 2,
"func" , TL_MSG_PARAM_STR, func,
"Message", TL_MSG_PARAM_STR, prtbuf );
@@ -60,7 +61,7 @@ int rmc_sendrep(const int rpfd, const int rep_type, ...)
va_end (args);
repsize = rbp - repbuf;
if (netwrite (rpfd, repbuf, repsize) != repsize) {
- rmclogit (func, RMC02, "send", neterror());
+ rmc_logit (func, RMC02, "send", neterror());
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 3,
"func" , TL_MSG_PARAM_STR, func,
"On" , TL_MSG_PARAM_STR, "send",
diff --git a/mediachanger/castorrmc/rmc/rmc_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c
index 2644f18bae1d83b7ffd316377725261b0ee13872..9aadee27aac09b79f06e5100ad5a76534fd108bf 100644
--- a/mediachanger/castorrmc/rmc/rmc_serv.c
+++ b/mediachanger/castorrmc/rmc/rmc_serv.c
@@ -20,7 +20,8 @@
#include "h/Cinit.h"
#include "h/marshall.h"
#include "h/net.h"
-#include "h/rmc.h"
+#include "h/rmc_constants.h"
+#include "h/rmc_logit.h"
#include "h/rmc_sendrep.h"
#include "h/rmc_server_api.h"
#include "h/rmc_smcsubr.h"
@@ -86,7 +87,7 @@ int rmc_main(struct main_args *main_args)
}
jid = getpid();
- rmclogit (func, "started\n");
+ rmc_logit (func, "started\n");
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 109, 2,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"Message", TL_MSG_PARAM_STR, "Daemon started" );
@@ -94,7 +95,7 @@ int rmc_main(struct main_args *main_args)
gethostname (localhost, CA_MAXHOSTNAMELEN+1);
if (strchr (localhost, '.') == NULL) {
if (Cdomainname (domainname, sizeof(domainname)) < 0) {
- rmclogit (func, "Unable to get domainname\n");
+ rmc_logit (func, "Unable to get domainname\n");
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 103, 2,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"Message", TL_MSG_PARAM_STR, "Unable to get domainname" );
@@ -104,7 +105,7 @@ int rmc_main(struct main_args *main_args)
}
if (main_args->argc != 2) {
- rmclogit (func, RMC01);
+ rmc_logit (func, RMC01);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 1, 1,
"func", TL_MSG_PARAM_STR, "rmc_main" );
exit (USERR);
@@ -112,7 +113,7 @@ int rmc_main(struct main_args *main_args)
robot = main_args->argv[1];
if (*robot == '\0' ||
(strlen (robot) + (*robot == '/') ? 0 : 5) > CA_MAXRBTNAMELEN) {
- rmclogit (func, RMC06, "robot");
+ rmc_logit (func, RMC06, "robot");
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 6, 2,
"func", TL_MSG_PARAM_STR, "rmc_main",
"For" , TL_MSG_PARAM_STR, "robot" );
@@ -132,20 +133,20 @@ int rmc_main(struct main_args *main_args)
extended_robot_info.smc_ldr,
&extended_robot_info.robot_info))) {
c = smc_lasterror (&smc_status, &msgaddr);
- rmclogit (func, RMC02, "get_geometry", msgaddr);
+ rmc_logit (func, RMC02, "get_geometry", msgaddr);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 4,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"On" , TL_MSG_PARAM_STR, "get_geometry",
"Message" , TL_MSG_PARAM_STR, msgaddr,
"NextStep", TL_MSG_PARAM_STR, "Retry" );
- rmclogit (func,"trying again get_geometry\n");
+ rmc_logit (func,"trying again get_geometry\n");
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 110, 2,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"Message", TL_MSG_PARAM_STR, "trying again get_geometry" );
n++;
if (n==2) {
- rmclogit (func, RMC02, "get_geometry", msgaddr);
+ rmc_logit (func, RMC02, "get_geometry", msgaddr);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 4,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"On" , TL_MSG_PARAM_STR, "get_geometry",
@@ -175,7 +176,7 @@ int rmc_main(struct main_args *main_args)
sense[12] == 0x20) {
extended_robot_info.smc_support_voltag = 0;
} else {
- rmclogit (func, RMC02, "find_cartridge", msgaddr);
+ rmc_logit (func, RMC02, "find_cartridge", msgaddr);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 4,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"On" , TL_MSG_PARAM_STR, "find_cartridge",
@@ -192,7 +193,7 @@ int rmc_main(struct main_args *main_args)
/* open request socket */
if ((s = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
- rmclogit (func, RMC02, "socket", neterror());
+ rmc_logit (func, RMC02, "socket", neterror());
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 4,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"On" , TL_MSG_PARAM_STR, "socket",
@@ -214,14 +215,14 @@ int rmc_main(struct main_args *main_args)
}
sin.sin_addr.s_addr = htonl(INADDR_ANY);
if (setsockopt (s, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) < 0) {
- rmclogit (func, RMC02, "setsockopt", neterror());
+ rmc_logit (func, RMC02, "setsockopt", neterror());
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 3,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"On" , TL_MSG_PARAM_STR, "setsockopt",
"Message" , TL_MSG_PARAM_STR, msgaddr );
}
if (bind (s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
- rmclogit (func, RMC02, "bind", neterror());
+ rmc_logit (func, RMC02, "bind", neterror());
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 4,
"func" , TL_MSG_PARAM_STR, "rmc_main",
"On" , TL_MSG_PARAM_STR, "bind",
@@ -308,7 +309,7 @@ static int getreq(
*req_type = n;
unmarshall_LONG (rbp, msglen);
if (msglen > RMC_REQBUFSZ) {
- rmclogit (func, RMC46, RMC_REQBUFSZ);
+ rmc_logit (func, RMC46, RMC_REQBUFSZ);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 46, 2,
"func" , TL_MSG_PARAM_STR, "getreq",
"MaxSize", TL_MSG_PARAM_INT, RMC_REQBUFSZ);
@@ -317,7 +318,7 @@ static int getreq(
l = msglen - sizeof(req_hdr);
n = netread_timeout (s, req_data, l, RMC_TIMEOUT);
if (getpeername (s, (struct sockaddr *) &from, &fromlen) < 0) {
- rmclogit (func, RMC02, "getpeername", neterror());
+ rmc_logit (func, RMC02, "getpeername", neterror());
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 4,
"func" , TL_MSG_PARAM_STR, "getreq",
"On" , TL_MSG_PARAM_STR, "getpeername",
@@ -334,13 +335,13 @@ static int getreq(
return (0);
} else {
if (l > 0) {
- rmclogit (func, RMC04, l);
+ rmc_logit (func, RMC04, l);
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 4, 3,
"func" , TL_MSG_PARAM_STR, "getreq",
"netread", TL_MSG_PARAM_INT, l,
"Return" , TL_MSG_PARAM_STR, "ERMCUNREC" );
} else if (l < 0) {
- rmclogit (func, RMC02, "netread", strerror(errno));
+ rmc_logit (func, RMC02, "netread", strerror(errno));
tl_rmcdaemon.tl_log( &tl_rmcdaemon, 2, 4,
"func" , TL_MSG_PARAM_STR, "getreq",
"On" , TL_MSG_PARAM_STR, "netread",
diff --git a/mediachanger/castorrmc/rmc/send2rmc.c b/mediachanger/castorrmc/rmc/send2rmc.c
index b9c22b4072b8b6f12572e49ad612406513c2e470..c2464e25810771ba73ddd79bdbc4dbc3a39a693c 100644
--- a/mediachanger/castorrmc/rmc/send2rmc.c
+++ b/mediachanger/castorrmc/rmc/send2rmc.c
@@ -10,12 +10,12 @@
#include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
-#include "Cnetdb.h"
-#include "marshall.h"
-#include "net.h"
-#include "rmc.h"
-#include "rmc_api.h"
-#include "serrno.h"
+#include "h/Cnetdb.h"
+#include "h/marshall.h"
+#include "h/net.h"
+#include "h/rmc_api.h"
+#include "h/rmc_constants.h"
+#include "h/serrno.h"
/* send2tpd - send a request to the SCSI media changer server and wait for the reply */