From a7615b30a6895b976c9d22bc2b78312820bd17f2 Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Tue, 19 Nov 2013 11:00:49 +0100
Subject: [PATCH] The castor-tape-mount executable is now built, but it does
nothing.
---
mediachanger/castorrmc/h/rmc_api.h | 4 ++--
mediachanger/castorrmc/rmc/rmc_mnt.c | 6 +++---
mediachanger/castorrmc/rmc/rmc_mnt.man | 8 ++++----
mediachanger/castorrmc/rmc/rmc_unmnt.c | 6 +++---
mediachanger/castorrmc/rmc/rmc_unmnt.man | 8 ++++----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/mediachanger/castorrmc/h/rmc_api.h b/mediachanger/castorrmc/h/rmc_api.h
index ae2a94fe00..b0784b4602 100644
--- a/mediachanger/castorrmc/h/rmc_api.h
+++ b/mediachanger/castorrmc/h/rmc_api.h
@@ -28,7 +28,7 @@ EXTERN_C int rmc_mount(const char *const server, const char *const vid, const in
EXTERN_C int rmc_read_elem_status(const char *const server, const int type, const int startaddr, const int nbelem, struct smc_element_info *const element_info);
EXTERN_C void rmc_seterrbuf(const char *const buffer, const int buflen);
EXTERN_C int send2rmc(const char *const host, const char *const reqp, const int reql, char *const user_repbuf, const int user_repbuf_len);
-EXTERN_C int rmc_mnt(const char *const server, const char *const vid, const char *const loader);
-EXTERN_C int rmc_unmnt(const char *const server, const char *const vid, const char *const loader);
+EXTERN_C int rmc_mnt(const char *const server, const char *const vid, const char *const drive);
+EXTERN_C int rmc_unmnt(const char *const server, const char *const vid, const char *const drive);
#endif
diff --git a/mediachanger/castorrmc/rmc/rmc_mnt.c b/mediachanger/castorrmc/rmc/rmc_mnt.c
index cc0c387481..95ee15bc2d 100644
--- a/mediachanger/castorrmc/rmc/rmc_mnt.c
+++ b/mediachanger/castorrmc/rmc/rmc_mnt.c
@@ -40,7 +40,7 @@
int rmc_mnt(
const char *const server,
const char *const vid,
- const char *const loader)
+ const char *const drive)
{
const gid_t gid = getgid();
const uid_t uid = getuid();
@@ -48,7 +48,7 @@ int rmc_mnt(
/* The total length of the fixed size members of the request message */
/* is Magic (4 bytes) + request ID (4 bytes) + length (4 bytes) + */
/* uid (4 bytes) + gid (4 bytes) = 20 bytes */
- const int msglen = 20 + strlen(vid) + 1 + strlen(loader) + 1;
+ const int msglen = 20 + strlen(vid) + 1 + strlen(drive) + 1;
char repbuf[1];
char *sbp = NULL;
@@ -78,7 +78,7 @@ int rmc_mnt(
marshall_LONG (sbp, uid);
marshall_LONG (sbp, gid);
marshall_STRING (sbp, vid);
- marshall_STRING (sbp, loader);
+ marshall_STRING (sbp, drive);
/* Being paranoid; checking the calculated message length against */
/* the number of bytes marshalled */
diff --git a/mediachanger/castorrmc/rmc/rmc_mnt.man b/mediachanger/castorrmc/rmc/rmc_mnt.man
index eee7173eb9..896b799228 100644
--- a/mediachanger/castorrmc/rmc/rmc_mnt.man
+++ b/mediachanger/castorrmc/rmc/rmc_mnt.man
@@ -11,7 +11,7 @@ rmc_mnt \- send a request to the Remote Media Changer daemon to have a volume mo
.sp
.BI "int rmc_mnt (char *" server ,
.BI "char *" vid ,
-.BI "char *" loader );
+.BI "char *" drive );
.SH DESCRIPTION
.B rmc_mnt
asks the Remote Media Changer server running on
@@ -19,7 +19,7 @@ asks the Remote Media Changer server running on
to mount the volume
.I vid
on the drive specified by
-.IR loader .
+.IR drive .
.TP
.I server
specifies the Remote Media Changer to be contacted.
@@ -28,7 +28,7 @@ specifies the Remote Media Changer to be contacted.
is the volume visual identifier.
It must be at most six characters long.
.TP
-.I loader
+.I drive
specifies the drive in the robot in one of the following forms:
.RS
.TP
@@ -52,7 +52,7 @@ is set appropriately.
Communication error.
.TP
.B ERMCUNREC
-Unknown host or invalid loader or vid too long or requester does not have
+Unknown host or invalid drive or vid too long or requester does not have
TP_SYSTEM privilege in the Cupv database.
.TP
.B ERMCFASTR
diff --git a/mediachanger/castorrmc/rmc/rmc_unmnt.c b/mediachanger/castorrmc/rmc/rmc_unmnt.c
index 7e7d869f00..9e8780a140 100644
--- a/mediachanger/castorrmc/rmc/rmc_unmnt.c
+++ b/mediachanger/castorrmc/rmc/rmc_unmnt.c
@@ -40,7 +40,7 @@
int rmc_unmnt(
const char *const server,
const char *const vid,
- const char *const loader)
+ const char *const drive)
{
const gid_t gid = getgid();
const uid_t uid = getuid();
@@ -48,7 +48,7 @@ int rmc_unmnt(
/* The total length of the fixed size members of the request message */
/* is Magic (4 bytes) + request ID (4 bytes) + length (4 bytes) + */
/* uid (4 bytes) + gid (4 bytes) = 20 bytes */
- const int msglen = 20 + strlen(vid) + 1 + strlen(loader) + 1;
+ const int msglen = 20 + strlen(vid) + 1 + strlen(drive) + 1;
char repbuf[1];
char *sbp = NULL;
@@ -78,7 +78,7 @@ int rmc_unmnt(
marshall_LONG (sbp, uid);
marshall_LONG (sbp, gid);
marshall_STRING (sbp, vid);
- marshall_STRING (sbp, loader);
+ marshall_STRING (sbp, drive);
/* Being paranoid; checking the calculated message length against */
/* the number of bytes marshalled */
diff --git a/mediachanger/castorrmc/rmc/rmc_unmnt.man b/mediachanger/castorrmc/rmc/rmc_unmnt.man
index c33dc3b199..c7603f8c30 100644
--- a/mediachanger/castorrmc/rmc/rmc_unmnt.man
+++ b/mediachanger/castorrmc/rmc/rmc_unmnt.man
@@ -11,7 +11,7 @@ rmc_unmnt \- send a request to the Remote Media Changer daemon to have a volume
.sp
.BI "int rmc_unmnt (char *" server ,
.BI "char *" vid ,
-.BI "char *" loader );
+.BI "char *" drive );
.SH DESCRIPTION
.B rmc_unmnt
asks the Remote Media Changer server running on
@@ -19,7 +19,7 @@ asks the Remote Media Changer server running on
to unmount the volume
.I vid
from the drive specified by
-.IR loader .
+.IR drive .
.TP
.I server
specifies the Remote Media Changer to be contacted.
@@ -28,7 +28,7 @@ specifies the Remote Media Changer to be contacted.
is the volume visual identifier.
It must be at most six characters long.
.TP
-.I loader
+.I drive
specifies the drive in the robot in one of the following forms:
.RS
.TP
@@ -52,7 +52,7 @@ is set appropriately.
Communication error.
.TP
.B ERMCUNREC
-Unknown host or invalid loader or vid too long or requester does not have
+Unknown host or invalid drive or vid too long or requester does not have
TP_SYSTEM privilege in the Cupv database.
.TP
.B ERMCFASTR
--
GitLab