From aa720ebae2657c3bcae11900bd06ae21e0697a85 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 11 Dec 2014 00:20:59 +0100
Subject: [PATCH] Improved the const correctness
---
mediachanger/castorrmc/h/rmc_send_scsi_cmd.h | 2 +-
mediachanger/castorrmc/h/rmc_smcsubr.h | 2 +-
mediachanger/castorrmc/rmc/rmc_procreq.c | 4 ++--
.../castorrmc/rmc/rmc_send_scsi_cmd.c | 2 +-
mediachanger/castorrmc/rmc/rmc_serv.c | 2 +-
mediachanger/castorrmc/rmc/rmc_smcsubr.c | 22 +++++++++----------
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h b/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h
index 71995f5999..436a71ca2c 100644
--- a/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h
+++ b/mediachanger/castorrmc/h/rmc_send_scsi_cmd.h
@@ -38,5 +38,5 @@ EXTERN_C int rmc_send_scsi_cmd (
const int senselen,
const int flags,
int *const nb_sense_ret,
- char **const msgaddr);
+ const char **const msgaddr);
diff --git a/mediachanger/castorrmc/h/rmc_smcsubr.h b/mediachanger/castorrmc/h/rmc_smcsubr.h
index 4b5e989db2..e704633a59 100644
--- a/mediachanger/castorrmc/h/rmc_smcsubr.h
+++ b/mediachanger/castorrmc/h/rmc_smcsubr.h
@@ -59,7 +59,7 @@ EXTERN_C int smc_find_cartridge(
EXTERN_C int smc_lasterror(
struct smc_status *const smc_stat,
- char **const msgaddr);
+ const char **const msgaddr);
EXTERN_C int smc_move_medium(
const int fd,
diff --git a/mediachanger/castorrmc/rmc/rmc_procreq.c b/mediachanger/castorrmc/rmc/rmc_procreq.c
index 616a529c41..6601824b4c 100644
--- a/mediachanger/castorrmc/rmc/rmc_procreq.c
+++ b/mediachanger/castorrmc/rmc/rmc_procreq.c
@@ -84,7 +84,7 @@ int rmc_srv_findcart(const struct rmc_srv_rqst_context *const rqst_context) {
gid_t gid;
int i;
char logbuf[CA_MAXVIDLEN+15];
- char *msgaddr;
+ const char *msgaddr;
int nbelem;
char *rbp;
char *repbuf;
@@ -320,7 +320,7 @@ int rmc_srv_readelem(const struct rmc_srv_rqst_context *const rqst_context) {
gid_t gid;
int i;
char logbuf[21];
- char *msgaddr;
+ const char *msgaddr;
int nbelem;
char *rbp;
char *repbuf;
diff --git a/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c b/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
index f7517657a1..629dd1e557 100644
--- a/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
+++ b/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
@@ -141,7 +141,7 @@ int rmc_send_scsi_cmd (
const int senselen,
const int flags,
int *const nb_sense_ret,
- char **const msgaddr)
+ const char **const msgaddr)
{
/* The timeout used when sending SCSI commands through the sg driver is in */
/* milliseconds and should equal that used by the st driver which on the */
diff --git a/mediachanger/castorrmc/rmc/rmc_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c
index d87301e44b..f44a232752 100644
--- a/mediachanger/castorrmc/rmc/rmc_serv.c
+++ b/mediachanger/castorrmc/rmc/rmc_serv.c
@@ -55,7 +55,7 @@ int rmc_main(const char *const robot)
char domainname[CA_MAXHOSTNAMELEN+1];
struct sockaddr_in from;
socklen_t fromlen = sizeof(from);
- char *msgaddr;
+ const char *msgaddr;
int nb_sense_ret;
int on = 1; /* for REUSEADDR */
char plist[40];
diff --git a/mediachanger/castorrmc/rmc/rmc_smcsubr.c b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
index 0f687a59c9..c35d8a6bb9 100644
--- a/mediachanger/castorrmc/rmc/rmc_smcsubr.c
+++ b/mediachanger/castorrmc/rmc/rmc_smcsubr.c
@@ -26,13 +26,13 @@
#define RBT_XTRA_PROC 10
static struct smc_status smc_status;
-static char *smc_msgaddr;
+static const char *smc_msgaddr;
static void save_error(
const int rc,
const int nb_sense,
const char *const sense,
- char *const msgaddr)
+ const char *const msgaddr)
{
smc_msgaddr = msgaddr;
smc_status.rc = rc;
@@ -84,7 +84,7 @@ static int get_element_size(
{
unsigned char buf[128];
unsigned char cdb[12];
- char *msgaddr;
+ const char *msgaddr;
int nb_sense_ret;
int rc;
char sense[MAXSENSE];
@@ -139,7 +139,7 @@ static int get_element_info(
char func[16];
int i;
int len;
- char *msgaddr;
+ const char *msgaddr;
int nb_sense_ret;
unsigned char *p;
unsigned char *page_end, *page_start;
@@ -250,7 +250,7 @@ int smc_get_geometry(
unsigned char buf[36];
unsigned char cdb[6];
char func[16];
- char *msgaddr;
+ const char *msgaddr;
int nb_sense_ret;
int rc;
char sense[MAXSENSE];
@@ -423,7 +423,7 @@ int smc_find_cartridge(
{
unsigned char cdb[12];
char func[16];
- char *msgaddr;
+ const char *msgaddr;
int nb_sense_ret;
char plist[40];
int rc;
@@ -601,7 +601,7 @@ int smc_move_medium(
{
unsigned char cdb[12];
char func[16];
- char *msgaddr;
+ const char *msgaddr;
int nb_sense_ret;
int rc;
char sense[MAXSENSE];
@@ -687,7 +687,7 @@ int smc_dismount (
int drive_not_unloaded = 1;
struct smc_element_info drive_element_info;
char func[16];
- char *msgaddr = 0;
+ const char *msgaddr = 0;
struct smc_status smc_status;
strncpy (func, "smc_dismount", sizeof(func));
@@ -768,7 +768,7 @@ int smc_export (
char func[16];
int i;
struct smc_element_info *impexp_info;
- char *msgaddr;
+ const char *msgaddr;
int nbelem;
struct smc_status smc_status;
@@ -836,7 +836,7 @@ int smc_import (
struct smc_element_info *element_info;
char func[16];
int i, j;
- char *msgaddr;
+ const char *msgaddr;
int nbelem;
int port_start;
int slot_start;
@@ -924,7 +924,7 @@ int smc_mount (
int c;
struct smc_element_info element_info;
char func[16];
- char *msgaddr;
+ const char *msgaddr;
struct smc_status smc_status;
strncpy (func, "smc_mount", sizeof(func));
--
GitLab