Skip to content
Snippets Groups Projects
Commit 1f94ff16 authored by Steven Murray's avatar Steven Murray
Browse files

Moved rmc_marshall_element() into its own object file

parent e20c1669
Branches
Tags
No related merge requests found
......@@ -11,7 +11,15 @@ include $(CASTOR_ROOT)/tape/Makefile
RMCD_DEPLIBS = DepSharedLibraryTargetName(tape,castortape)
RMCD_LIBS = $(RMCD_DEPLIBS) BuildRPathcastortape
RMCD_OBJS = rmc_serv.o rmc_procreq.o rmc_logit.o rmc_logreq.o rmc_sendrep.o rmc_smcsubr.o rmc_send_scsi_cmd.o
RMCD_OBJS = \
rmc_serv.o \
rmc_procreq.o \
rmc_logit.o \
rmc_logreq.o \
rmc_marshall_element.o \
rmc_sendrep.o \
rmc_smcsubr.o \
rmc_send_scsi_cmd.o
TapeProgramTarget(rmcd,$(RMCD_OBJS),$(RMCD_DEPLIBS),$(RMCD_LIBS),755)
ADMMANPAGE(rmcd)
TapeMakeDir($(LOGPATH),0755)
......
......@@ -18,6 +18,7 @@
#include "h/rmc_constants.h"
#include "h/rmc_logit.h"
#include "h/rmc_logreq.h"
#include "h/rmc_marshall_element.h"
#include "h/rmc_smcsubr.h"
#include "h/rmc_smcsubr2.h"
#include "h/rmc_sendrep.h"
......@@ -28,24 +29,6 @@
extern struct extended_robot_info extended_robot_info;
extern char localhost[CA_MAXHOSTNAMELEN+1];
static int rmc_marshall_element (
char **const sbpp,
const struct smc_element_info *const element_info)
{
char *sbp = *sbpp;
marshall_WORD (sbp, element_info->element_address);
marshall_BYTE (sbp, element_info->element_type);
marshall_BYTE (sbp, element_info->state);
marshall_BYTE (sbp, element_info->asc);
marshall_BYTE (sbp, element_info->ascq);
marshall_BYTE (sbp, element_info->flags);
marshall_WORD (sbp, element_info->source_address);
marshall_STRING (sbp, element_info->name);
*sbpp = sbp;
return (0);
}
/* rmc_srv_export - export/eject a cartridge from the robot */
int rmc_srv_export(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment