Imported Debian patch 2.5.1-1
[debian/amanda] / changer-src / scsi-changer-driver.c
index 2bc0507326119a31518c435a297efc4e5577f750..0c274af7b64b64dcb6ac621c5d122916d2a3687e 100644 (file)
@@ -1,6 +1,4 @@
- #ifndef lint
-static char rcsid[] = "$Id: scsi-changer-driver.c,v 1.1.2.27.2.7.2.10 2003/01/26 19:20:56 martinea Exp $";
-#endif
+static char rcsid[] = "$Id: scsi-changer-driver.c,v 1.52 2006/07/21 00:25:50 martinea Exp $";
 /*
  * Interface to control a tape robot/library connected to the SCSI bus
  *
@@ -9,10 +7,6 @@ static char rcsid[] = "$Id: scsi-changer-driver.c,v 1.1.2.27.2.7.2.10 2003/01/26
 
 #include <amanda.h>
 
-#ifdef HAVE_DMALLOC_H
-#include <dmalloc.h>
-#endif
-
 #include "arglist.h"
 /*
 #ifdef HAVE_STDIO_H
@@ -47,9 +41,8 @@ static char rcsid[] = "$Id: scsi-changer-driver.c,v 1.1.2.27.2.7.2.10 2003/01/26
 
 #include "tapeio.h"
 
-extern int TapeEject(int DeviceFD);
-
 extern FILE *debug_file;
+extern changer_t *changer;    /* Needed for the infos about emubarcode and labelfile */
 
 int PrintInquiry(SCSIInquiry_T *);
 int GenericElementStatus(int DeviceFD, int InitStatus);
@@ -58,84 +51,90 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus);
 ElementInfo_T *LookupElement(int addr);
 int GenericResetStatus(int DeviceFD);
 int RequestSense(int, ExtendedRequestSense_T *, int  );
-void dump_hex(char *, int, int, int);
-void TerminateString(char *string, int length);
+void dump_hex(u_char *, size_t, int, int);
+void TerminateString(char *string, size_t length);
 void ChgExit(char *, char *, int);
 int BarCode(int fd);
 int LogSense(int fd);
-int SenseHandler(int fd, unsigned char flag, unsigned char SenseKey, unsigned char AdditionalSenseCode, unsigned char AdditionalSenseCodeQualifier, char *buffer);
+int SenseHandler(int fd, u_char flag, u_char SenseKey, u_char AdditionalSenseCode, u_char AdditionalSenseCodeQualifier, RequestSense_T *buffer);
 
-int SCSI_AlignElements(int DeviceFD, int MTE, int DTE, int STE);
+int SCSI_AlignElements(int DeviceFD, size_t MTE, size_t DTE, size_t STE);
+
+int DoNothing0(void);
+int DoNothing1(int);
+int DoNothing2(int, int);
+int DoNothing3(int, int, int);
 
-int DoNothing();
 int GenericMove(int, int, int);
 int SDXMove(int, int, int);
 int CheckMove(ElementInfo_T *from, ElementInfo_T *to);
 int GenericRewind(int);
-/* int GenericStatus(); */
-int GenericFree();
-int TapeStatus();                   /* Is the tape loaded ? */
+/* int GenericStatus(void); */
+int GenericFree(void);
+int TapeStatus(void);                   /* Is the tape loaded ? */
 int DLT4000Eject(char *Device, int type);
 int GenericEject(char *Device, int type);
 int GenericClean(char *Device);                 /* Does the tape need a clean */
 int GenericBarCode(int DeviceFD);               /* Do we have Barcode reader support */
 int NoBarCode(int DeviceFD);
 
-int GenericSearch();
+int GenericSearch(void);
 void Inventory(char *labelfile, int drive, int eject, int start, int stop, int clean);
 
 int TreeFrogBarCode(int DeviceFD);
 int EXB_BarCode(int DeviceFD);
-int GenericSenseHandler(int fd, int flags, unsigned char SenseKey, unsigned char AdditionalSenseCode, unsigned char AdditionalSenseCodeQualifier, char *);
+int GenericSenseHandler(int fd, u_char flags, u_char SenseKey, u_char AdditionalSenseCode, u_char AdditionalSenseCodeQualifier, RequestSense_T *);
 
 ElementInfo_T *LookupElement(int address);
 int eject_tape(char *tapedev, int type);
 int unload(int fd, int drive, int slot);
 int load(int fd, int drive, int slot);
 int GetElementStatus(int DeviceFD);
+int drive_loaded(int fd, int drivenum);
 
 /*
  * Log Pages Decode
  */
-void WriteErrorCountersPage(LogParameter_T *, int);
-void ReadErrorCountersPage(LogParameter_T *, int);
-void C1553APage30(LogParameter_T *, int);
-void C1553APage37(LogParameter_T *, int);
-void EXB85058HEPage39(LogParameter_T *, int);
-void EXB85058HEPage3c(LogParameter_T *, int);
-int Decode(LogParameter_T *, int *); 
-int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *out);
+void WriteErrorCountersPage(LogParameter_T *, size_t);
+void ReadErrorCountersPage(LogParameter_T *, size_t);
+void C1553APage30(LogParameter_T *, size_t);
+void C1553APage37(LogParameter_T *, size_t);
+void EXB85058HEPage39(LogParameter_T *, size_t);
+void EXB85058HEPage3c(LogParameter_T *, size_t);
+int Decode(LogParameter_T *, unsigned *);
+int DecodeModeSense(u_char *buffer, size_t offset, char *pstring, char block, FILE *out);
 
 int SCSI_Run(int DeviceFD,
             Direction_T Direction,
             CDB_T CDB,
-            int CDB_Length,
+            size_t CDB_Length,
             void *DataBuffer,
-            int DataBufferLength,
-            char *pRequestSense,
-            int RequestSenseLength);
+            size_t DataBufferLength,
+            RequestSense_T *pRequestSense,
+            size_t RequestSenseLength);
 
-int SCSI_Move(int DeviceFD, unsigned char chm, int from, int to);
-int SCSI_LoadUnload(int DeviceFD, RequestSense_T *pRequestSense, unsigned char byte1, unsigned char load);
+int SCSI_Move(int DeviceFD, u_char chm, int from, int to);
+int SCSI_LoadUnload(int DeviceFD, RequestSense_T *pRequestSense, u_char byte1, u_char load);
 int SCSI_TestUnitReady(int, RequestSense_T *);
-int SCSI_ModeSense(int DeviceFD, char *buffer, u_char size, u_char byte1, u_char byte2);
-int SCSI_ModeSelect(int DeviceFD, 
-                    char *buffer,
-                    unsigned char length,
-                    unsigned char save,
-                    unsigned char mode,
-                    unsigned char lun);
-
-int SCSI_ReadElementStatus(int DeviceFD, 
-                           unsigned char type,
-                           unsigned char lun,
-                           unsigned char VolTag,
+int SCSI_ModeSense(int DeviceFD, u_char *buffer, u_char size, u_char byte1, u_char byte2);
+int SCSI_ModeSelect(int DeviceFD,
+                    u_char *buffer,
+                    u_char length,
+                    u_char save,
+                    u_char mode,
+                    u_char lun);
+
+int SCSI_ReadElementStatus(int DeviceFD,
+                           u_char type,
+                           u_char lun,
+                           u_char VolTag,
                            int StartAddress,
-                           int NoOfElements,
-                          int DescriptorSize,
-                          char **data);
+                           size_t NoOfElements,
+                          size_t DescriptorSize,
+                          u_char **data);
 
 FILE *StatFile;
+static int barcode;   /* cache the result from the BarCode function */
 
 SC_COM_T SCSICommand[] = {
   {0x00,
@@ -167,7 +166,7 @@ SC_COM_T SCSICommand[] = {
    "UNLOAD"},
   {0x4D,
    10,
-   "LOG SENSE"}, 
+   "LOG SENSE"},
   {0xA5,
    12,
    "MOVE MEDIUM"},
@@ -198,16 +197,16 @@ ChangerCMD_T ChangerIO[] = {
    "HP Auto Loader [C1553A]",
    GenericMove,
    GenericElementStatus,
-   DoNothing,
+   DoNothing1,
    GenericFree,
    GenericEject,
    GenericClean,
    GenericRewind,
    GenericBarCode,
    GenericSearch,
-   GenericSenseHandler}, 
+   GenericSenseHandler},
   /* Exabyte Devices */
-  {"EXB-10e",      
+  {"EXB-10e",
    "Exabyte Robot [EXB-10e]",
    GenericMove,
    GenericElementStatus,
@@ -219,7 +218,7 @@ ChangerCMD_T ChangerIO[] = {
    GenericBarCode,
    GenericSearch,
    GenericSenseHandler},
-  {"EXB-120",   
+  {"EXB-120",
    "Exabyte Robot [EXB-120]",
    GenericMove,
    GenericElementStatus,
@@ -231,7 +230,7 @@ ChangerCMD_T ChangerIO[] = {
    EXB_BarCode,
    GenericSearch,
    GenericSenseHandler},
-  {"EXB-210",   
+  {"EXB-210",
    "Exabyte Robot [EXB-210]",
    GenericMove,
    GenericElementStatus,
@@ -243,12 +242,12 @@ ChangerCMD_T ChangerIO[] = {
    EXB_BarCode,
    GenericSearch,
    GenericSenseHandler},
-  {"EXB-85058HE-0000",        
+  {"EXB-85058HE-0000",
    "Exabyte Tape [EXB-85058HE-0000]",
-   DoNothing,
-   DoNothing,
-   DoNothing,
-   DoNothing,
+   DoNothing3,
+   DoNothing2,
+   DoNothing1,
+   DoNothing0,
    GenericEject,
    GenericClean,
    GenericRewind,
@@ -256,7 +255,7 @@ ChangerCMD_T ChangerIO[] = {
    GenericSearch,
    GenericSenseHandler},
   /* Tandberg Devices */
-  {"TDS 1420",              
+  {"TDS 1420",
    "Tandberg Robot (TDS 1420)",
    GenericMove,
    GenericElementStatus,
@@ -269,7 +268,7 @@ ChangerCMD_T ChangerIO[] = {
    GenericSearch,
    GenericSenseHandler},
     /* ADIC Devices */
-  {"VLS DLT",               
+  {"VLS DLT",
    "ADIC VLS DLT Library [VLS DLT]",
    GenericMove,
    GenericElementStatus,
@@ -281,7 +280,7 @@ ChangerCMD_T ChangerIO[] = {
    GenericBarCode,
    GenericSearch,
    GenericSenseHandler},
-  {"VLS SDX",               
+  {"VLS SDX",
    "ADIC VLS DLT Library [VLS SDX]",
    SDXMove,
    SDXElementStatus,
@@ -293,7 +292,7 @@ ChangerCMD_T ChangerIO[] = {
    GenericBarCode,
    GenericSearch,
    GenericSenseHandler},
-  {"FastStor DLT",               
+  {"FastStor DLT",
    "ADIC FastStor DLT Library [FastStor DLT]",
    SDXMove,
    DLT448ElementStatus,
@@ -356,7 +355,7 @@ ChangerCMD_T ChangerIO[] = {
    GenericBarCode,
    GenericSearch,
    GenericSenseHandler},
-  /* 
+  /*
    * And now the tape devices
    */
   /* The generic handler if nothing matches */
@@ -374,42 +373,42 @@ ChangerCMD_T ChangerIO[] = {
    GenericSenseHandler},
   {"DLT8000",
    "DLT Tape [DLT8000]",
-   DoNothing,
-   DoNothing,
-   DoNothing,
-   DoNothing,
+   DoNothing3,
+   DoNothing2,
+   DoNothing1,
+   DoNothing0,
    DLT4000Eject,
    GenericClean,
    GenericRewind,
    GenericBarCode,
    GenericSearch,
    GenericSenseHandler},
-  {"DLT7000",        
+  {"DLT7000",
    "DLT Tape [DLT7000]",
-   DoNothing,
-   DoNothing,
-   DoNothing,
-   DoNothing,
+   DoNothing3,
+   DoNothing2,
+   DoNothing1,
+   DoNothing0,
    DLT4000Eject,
    GenericClean,
    GenericRewind,
    GenericBarCode,
    GenericSearch,
    GenericSenseHandler},
-  {"DLT4000",        
+  {"DLT4000",
    "DLT Tape [DLT4000]",
-   DoNothing,
-   DoNothing,
-   DoNothing,
-   DoNothing,
+   DoNothing3,
+   DoNothing2,
+   DoNothing1,
+   DoNothing0,
    DLT4000Eject,
    GenericClean,
    GenericRewind,
-   NoBarCode, 
+   NoBarCode,
    GenericSearch,
    GenericSenseHandler},
   {NULL, NULL, NULL,NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
-};           
+};
 
 
 LogPageDecode_T DecodePages[] = {
@@ -446,10 +445,10 @@ int LibModeSenseValid = 0;          /* Set if we did an scussefull MODE SENSE */
 
 char *SlotArgs = 0;
 /* Pointer to MODE SENSE Pages */
-char *pModePage = NULL;
+u_char *pModePage = NULL;
 EAAPage_T *pEAAPage = NULL;
 DeviceCapabilitiesPage_T *pDeviceCapabilitiesPage = NULL;
-char *pVendorUnique = NULL;
+u_char *pVendorUnique = NULL;
 
 /*
  *  New way, every element type has its on array
@@ -459,12 +458,12 @@ ElementInfo_T *pMTE = NULL; /*Medium Transport Element */
 ElementInfo_T *pSTE = NULL; /*Storage Element */
 ElementInfo_T *pIEE = NULL; /*Import Export Element */
 ElementInfo_T *pDTE = NULL; /*Data Transfer Element */
-int MTE = 0;                /*Counter for the above element types */
-int STE = 0;
-int IEE = 0;
-int DTE = 0; 
+size_t MTE = 0;                /*Counter for the above element types */
+size_t STE = 0;
+size_t IEE = 0;
+size_t DTE = 0;
 
-char *chgscsi_datestamp = NULL;       /* Result pointer for tape_rdlabel */       
+char *chgscsi_datestamp = NULL;       /* Result pointer for tape_rdlabel */
 char *chgscsi_label = NULL;           /* Result pointer for tape_rdlabel */
 char *chgscsi_result = NULL;          /* Needed for the result string of MapBarCode */
 
@@ -477,7 +476,8 @@ char *chgscsi_result = NULL;          /* Needed for the result string of MapBarC
  * Print the scsi-changer-driver version
  */
 
-void ChangerDriverVersion()
+void
+ChangerDriverVersion(void)
 {
   DebugPrint(DEBUG_ERROR, SECTION_INFO, "scsi-changer-driver: %s\n",rcsid);
   SCSI_OS_Version();
@@ -487,7 +487,8 @@ void ChangerDriverVersion()
  * Try to generate an template which can be used as an example for the config file
  *
  */
-void PrintConf()
+void
+PrintConf(void)
 {
   extern OpenFiles_T *pDev;
   int count;
@@ -515,7 +516,7 @@ void PrintConf()
   printf("sleep            ??? # How long to wait after an eject command before moving\n");
   printf("                     # the tape\n");
   printf("                     #\n");
-  
+
   for (count = 0; count < CHG_MAXDEV ; count++)
     {
       if (pDev[count].dev)
@@ -527,7 +528,7 @@ void PrintConf()
            }
        }
     }
-  
+
   /*
    * Did we reach the end of the list ?
    * If no we found an changer and now we try to
@@ -535,11 +536,11 @@ void PrintConf()
    */
   if (count < CHG_MAXDEV)
     {
-      pDev[count].functions->function_status(count, 1);  
+      pDev[count].functions->function_status(count, 1);
     } else {
       printf("changerdev   ??? # Ups nothing found. Please check the docs\n");
     }
-  
+
   printf("                     #\n");
   printf("                     # Here now comes the config for the first tape\n");
   printf("config             0 # This value is the one which is used in the amanda\n");
@@ -581,7 +582,7 @@ void PrintConf()
     {
       printf("startuse          0  # Which is the first slot to use\n");
       printf("                     #\n");
-      printf("enduse            %d  # Which is the last slot to use\n", STE);
+      printf("enduse            " SIZE_T_FMT "  # Which is the last slot to use\n", STE);
     } else {
       printf("startuse         ??? # Which is the first slot to use\n");
       printf("                     #\n");
@@ -591,8 +592,10 @@ void PrintConf()
       printf("                     # cleaning tape in the last slot\n");
       printf("                     #\n");
 
-  cwd = getcwd(NULL, 0);
-  
+  if ((cwd = getcwd(NULL, 0)) == NULL) {
+      cwd = "<unknown>";
+  }
+
   printf("statfile %s/tape0-slot #\n",cwd);
   printf("cleanfile %s/tape0-clean #\n", cwd);
   printf("usagecount %s/tape0-totaltime #\n", cwd);
@@ -601,11 +604,11 @@ void PrintConf()
 }
 
 
+
 /*
  * Try to create a list of tapes and labels which are in the current
  * magazin. The drive must be empty !!
- * 
+ *
  * labelfile -> file name of the db
  * drive -> which drive should we use
  * eject -> the tape device needs an eject before move
@@ -613,7 +616,7 @@ void PrintConf()
  * stop  -> stop at slot stop
  * clean -> if we have an cleaning tape than this is the slot number of it
  *
- * return 
+ * return
  * 0  -> fail
  * 1  -> successfull
  *
@@ -622,55 +625,64 @@ void PrintConf()
  * If an tape is loaded unload it and do initialize element status to
  * get all labels if an bar code reader is installed
  */
-void Inventory(char *labelfile, int drive, int eject, int start, int stop, int clean)
+void
+Inventory(
+    char *     labelfile,
+    int                drive,
+    int                eject,
+    int                start,
+    int                stop,
+    int                clean)
 {
   extern OpenFiles_T *pDev;
-  int x;
-  char *datestamp = malloc(1);   /* stupid, but tapefd_rdlabel does an free at the begining ... */
-  char *label = malloc(1);       /* the same here ..... */
-  char *result;                    /* Used to store the result of MapBarCode */
-  int barcode;                   /* cache the result from the BarCode function */
-  static int inv_done = 0;       /* Inventory function called ?, marker to disable recursion */
-  MBC_T *pbarcoderes = malloc(sizeof(MBC_T));    /* Here we will pass the parameter to MapBarCode and get the result */
-  
+  size_t x;
+  static int inv_done = 0;     /* Inventory function called ?, marker to disable recursion */
+  MBC_T *pbarcoderes;          /* Here we will pass the parameter to MapBarCode and get the result */
+
+  (void)start; /* Quiet unused parameter warning */
+  (void)stop;  /* Quiet unused parameter warning */
+
   DebugPrint(DEBUG_INFO,SECTION_MAP_BARCODE, "##### START Inventory\n");
-  memset(pbarcoderes, 0 , sizeof(MBC_T));
+  pbarcoderes = alloc(SIZEOF(MBC_T));
+  memset(pbarcoderes, 0 , SIZEOF(MBC_T));
 
   if (inv_done != 0)
     {
       DebugPrint(DEBUG_INFO,SECTION_MAP_BARCODE, "##### STOP inv_done -> %d Inventory\n",inv_done);
+      free(pbarcoderes);
       return;
+      /*NOTREACHED*/
     }
   inv_done = 1;
   barcode = BarCode(INDEX_CHANGER);
-  
+
   pbarcoderes->action = RESET_VALID;
 
   MapBarCode(labelfile,pbarcoderes);
-  
+
   /*
    * Check if an tape is loaded, if yes unload it
    * and do an INIT ELEMENT STATUS
    */
-  
+
   if (pDTE[0].status == 'F')
     {
       if (eject)
        {
-         eject_tape("", eject);
+         (void)eject_tape("", eject);
        }
       (void)unload(INDEX_TAPE, 0, 0);
     }
-  
+
   GenericResetStatus(INDEX_CHANGER);
+
   for (x = 0; x < STE; x++)
     {
-      if (x == clean)
+      if (x == (size_t)clean)
        {
          continue;
        }
-      
+
       /*
        * Load the tape, on error try the next
        * error could be an empty slot for example
@@ -688,16 +700,18 @@ void Inventory(char *labelfile, int drive, int eject, int start, int stop, int c
 
       SCSI_CloseDevice(INDEX_TAPE);
 
-      if ((result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &datestamp, &label)) == NULL)
+      if ((chgscsi_result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &chgscsi_datestamp, &chgscsi_label)) == NULL)
       {
        pbarcoderes->action = UPDATE_SLOT;
-       strcpy(pbarcoderes->data.voltag, label);
+       strncpy(pbarcoderes->data.voltag, chgscsi_label,
+               SIZEOF(pbarcoderes->data.voltag));
        pbarcoderes->data.slot = x;
        pbarcoderes->data.from = 0;
        pbarcoderes->data.LoadCount = 1;
        if (BarCode(INDEX_CHANGER) == 1)
          {
-           strcpy(pbarcoderes->data.barcode, pDTE[drive].VolTag);
+           strncpy(pbarcoderes->data.barcode, pDTE[drive].VolTag,
+                   SIZEOF(pbarcoderes->data.barcode));
            MapBarCode(labelfile, pbarcoderes);
          } else {
            MapBarCode(labelfile, pbarcoderes);
@@ -708,19 +722,23 @@ void Inventory(char *labelfile, int drive, int eject, int start, int stop, int c
 
       if (eject)
        {
-         eject_tape("", eject);
+         (void)eject_tape("", eject);
        }
 
       (void)unload(INDEX_TAPE, drive, x);
     }
   DebugPrint(DEBUG_INFO,SECTION_MAP_BARCODE, "##### STOP Inventory\n");
+  free(pbarcoderes);
 }
 
 /*
  * Check if the slot ist empty
  * slot -> slot number to check
  */
-int isempty(int fd, int slot)
+int
+isempty(
+    int                fd,
+    int                slot)
 {
   extern OpenFiles_T *pDev;
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### START isempty\n");
@@ -731,6 +749,7 @@ int isempty(int fd, int slot)
         {
           DebugPrint(DEBUG_ERROR,SECTION_TAPE,"##### STOP isempty [-1]\n");
           return(-1);
+         /*NOTREACHED*/
         }
     }
 
@@ -738,27 +757,31 @@ int isempty(int fd, int slot)
     {
       DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### STOP isempty [1]\n");
       return(1);
+      /*NOTREACHED*/
     }
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### STOP isempty [0]\n");
   return(0);
 }
 
-int get_clean_state(char *tapedev)
+int
+get_clean_state(
+    char *tapedev)
 {
   extern OpenFiles_T *pDev;
   /* Return 1 if cleaning is needed */
   int ret;
-  
+
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### START get_clean_state\n");
 
   if (pDev[INDEX_TAPECTL].SCSI == 0)
     {
       DebugPrint(DEBUG_ERROR,SECTION_TAPE,"##### STOP get_clean_state [-1]\n");
       return(-1);
+      /*NOTREACHED*/
     }
   ret=pDev[INDEX_TAPECTL].functions->function_clean(tapedev);
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### STOP get_clean_state [%d]\n", ret);
-  return(ret);    
+  return(ret);
 }
 
 /*
@@ -767,19 +790,22 @@ int get_clean_state(char *tapedev)
  * Type describes if we should force the SCSI eject if available
  * normal eject is done with the ioctl
  */
-int eject_tape(char *tapedev, int type)
-  /* This function ejects the tape from the drive */
+/* This function ejects the tape from the drive */
+
+int
+eject_tape(
+    char *     tapedev,
+    int                type)
 {
   extern OpenFiles_T *pDev;
-  int ret = 0;
-  extern changer_t chg;         /* Needed for the infos about emubarcode and labelfile */
+  int ret;
 
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### START eject_tape\n");
 
   /*
    * Try to read the label
    */
-  if (pDev[INDEX_TAPE].avail == 1 && (chg.emubarcode == 1 || BarCode(INDEX_CHANGER)))
+  if (pDev[INDEX_TAPE].avail == 1 && (changer->emubarcode == 1 || BarCode(INDEX_CHANGER)))
     {
 
       if (pDev[INDEX_TAPECTL].SCSI == 1 && pDev[INDEX_TAPECTL].avail) {
@@ -792,7 +818,7 @@ int eject_tape(char *tapedev, int type)
        {
          SCSI_CloseDevice(INDEX_TAPE);
        }
-      
+
       chgscsi_result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &chgscsi_datestamp, &chgscsi_label);
     }
 
@@ -801,13 +827,15 @@ int eject_tape(char *tapedev, int type)
       ret=pDev[INDEX_TAPECTL].functions->function_eject(tapedev, type);
       DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### STOP (SCSI)eject_tape [%d]\n", ret);
       return(ret);
+      /*NOTREACHED*/
     }
-  
+
   if (pDev[INDEX_TAPE].avail == 1)
     {
       ret=Tape_Ioctl(INDEX_TAPE, IOCTL_EJECT);
       DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### STOP (ioctl)eject_tape [%d]\n", ret);
       return(ret);
+      /*NOTREACHED*/
     }
 
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"##### STOP eject_tape [-1]\n");
@@ -816,11 +844,15 @@ int eject_tape(char *tapedev, int type)
 
 
 /* Find an empty slot, starting at start, ending at start+count */
-int find_empty(int fd, int start, int count)
+int
+find_empty(
+    int        fd,
+    int        start,
+    int        count)
 {
   extern OpenFiles_T *pDev;
-  int x;
-  int end;
+  size_t x;
+  size_t end;
 
   DebugPrint(DEBUG_INFO,SECTION_ELEMENT,"###### START find_empty\n");
 
@@ -828,35 +860,42 @@ int find_empty(int fd, int start, int count)
     {
       if ( pDev[fd].functions->function_status(fd , 1) != 0)
         {
-          DebugPrint(DEBUG_ERROR,SECTION_ELEMENT,"###### END find_empty [%d]\n", -1);
-          return(-1);
+          DebugPrint(DEBUG_ERROR,SECTION_ELEMENT,
+                    "###### END find_empty [-1]\n");
+          return((ssize_t)-1);
+         /*NOTREACHED*/
         }
     }
-  
+
   if (count == 0)
     {
       end = STE;
     } else {
       end = start + count;
     }
-  
+
   if (end > STE)
     {
       end = STE;
     }
-  
-  DebugPrint(DEBUG_INFO,SECTION_ELEMENT,"start at %d, end at %d\n", start, end);
+
+  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,
+            "start at " SIZE_T_FMT ", end at " SIZE_T_FMT "\n",
+            (SIZE_T_FMT_TYPE)start,
+            (SIZE_T_FMT_TYPE)end);
 
   for (x = start; x < end; x++)
     {
       if (pSTE[x].status == 'E')
         {
-          DebugPrint(DEBUG_INFO,SECTION_ELEMENT,"###### END find_empty [%d]\n", x);     
-          return(x);
+          DebugPrint(DEBUG_INFO,SECTION_ELEMENT,
+                    "###### END find_empty [" SIZE_T_FMT "]\n", x);
+          return((ssize_t)x);
+         /*NOTREACHED*/
         }
     }
-  DebugPrint(DEBUG_ERROR,SECTION_ELEMENT,"###### END find_empty [%d]\n", -1);
-  return(-1);
+  DebugPrint(DEBUG_ERROR,SECTION_ELEMENT,"###### END find_empty [-1]\n");
+  return((ssize_t)-1);
 }
 
 /*
@@ -867,30 +906,34 @@ int find_empty(int fd, int start, int count)
  * 0  -> drive is empty
  * 1  -> drive is loaded
  */
-int drive_loaded(int fd, int drivenum)
+int
+drive_loaded(
+    int                fd,
+    int                drivenum)
 {
   extern OpenFiles_T *pDev;
 
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"###### START drive_loaded\n");
   DebugPrint(DEBUG_INFO,SECTION_TAPE,"%-20s : fd %d drivenum %d \n", "drive_loaded", fd, drivenum);
-  
-  
+
+
   if (ElementStatusValid == 0)
     {
       if (pDev[INDEX_CHANGER].functions->function_status(INDEX_CHANGER, 1) != 0)
        {
          DebugPrint(DEBUG_ERROR,SECTION_TAPE,"Fatal error\n");
          return(-1);
+         /*NOTREACHED*/
        }
     }
-  
+
   if (pDTE[drivenum].status == 'E') {
     DebugPrint(DEBUG_INFO,SECTION_TAPE,"###### STOP drive_loaded (empty)\n");
     return(0);
-  } else {
-    DebugPrint(DEBUG_INFO,SECTION_TAPE,"###### STOP drive_loaded (not empty)\n");
-    return(1);
+    /*NOTREACHED*/
   }
+  DebugPrint(DEBUG_INFO,SECTION_TAPE,"###### STOP drive_loaded (not empty)\n");
+  return(1);
 }
 
 
@@ -901,18 +944,21 @@ int drive_loaded(int fd, int drivenum)
  * TODO:
  * Check if the MTE is empty
  */
-int unload(int fd, int drive, int slot) 
+int
+unload(
+    int                fd,
+    int                drive,
+    int                slot)
 {
   extern OpenFiles_T *pDev;
-  int ret;
-  extern changer_t chg;         /* Needed for the infos about emubarcode and labelfile */
   extern int do_inventory;
-  MBC_T *pbarcoderes = malloc(sizeof(MBC_T));
+  MBC_T *pbarcoderes;
 
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"###### START unload\n");
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"%-20s : fd %d, slot %d, drive %d \n", "unload", fd, slot, drive);
-  memset(pbarcoderes, 0, sizeof(MBC_T));
-  
+  pbarcoderes = alloc(SIZEOF(MBC_T));
+  memset(pbarcoderes, 0, SIZEOF(MBC_T));
+
   /*
    * If the Element Status is not valid try to
    * init it
@@ -923,16 +969,18 @@ int unload(int fd, int drive, int slot)
        {
          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"Element Status not valid, reset failed\n");
          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP unload (-1)\n");
+         free(pbarcoderes);
          return(-1);
+         /*NOTREACHED*/
        }
     }
-  
-  DebugPrint(DEBUG_INFO, SECTION_TAPE,"%-20s : unload drive %d[%d] slot %d[%d]\n", "unload", 
-            drive, 
-            pDTE[drive].address, 
-            slot, 
+
+  DebugPrint(DEBUG_INFO, SECTION_TAPE,"%-20s : unload drive %d[%d] slot %d[%d]\n", "unload",
+            drive,
+            pDTE[drive].address,
+            slot,
             pSTE[slot].address);
-  
+
   /*
    * Unloading an empty tape unit makes no sense
    * so return with an error
@@ -941,40 +989,46 @@ int unload(int fd, int drive, int slot)
     {
       DebugPrint(DEBUG_ERROR, SECTION_TAPE,"unload : Drive %d address %d is empty\n", drive, pDTE[drive].address);
       DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP unload (-1)\n");
+      free(pbarcoderes);
       return(-1);
+      /*NOTREACHED*/
     }
-  
+
   /*
    * If the destination slot is full
    * try to find an enpty slot
    */
-  if (pSTE[slot].status == 'F')  
+  if (pSTE[slot].status == 'F')
     {
       DebugPrint(DEBUG_INFO, SECTION_TAPE,"unload : Slot %d address %d is full\n", drive, pSTE[slot].address);
       if ( ElementStatusValid == 0)
        {
          DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "unload: Element Status not valid, can't find an empty slot\n");
+         free(pbarcoderes);
          return(-1);
+         /*NOTREACHED*/
        }
-      
+
       slot = find_empty(fd, 0, 0);
       if (slot == -1 )
       {
              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "unload: No Empty slot found\n");
+             free(pbarcoderes);
              return(-1);
+             /*NOTREACHED*/
       }
       DebugPrint(DEBUG_INFO, SECTION_TAPE,"unload : found empty one, try to unload to slot %d\n", slot);
     }
 
-  
+
 
   /*
    * If eject is not set we must read the label info
    */
 
-  if (chg.eject == 0)
+  if (changer->eject == 0)
     {
-      if (pDev[INDEX_TAPE].avail == 1 && (chg.emubarcode == 1 || BarCode(INDEX_CHANGER)))
+      if (pDev[INDEX_TAPE].avail == 1 && (changer->emubarcode == 1 || BarCode(INDEX_CHANGER)))
        {
 
          if (pDev[INDEX_TAPECTL].SCSI == 1 && pDev[INDEX_TAPECTL].avail) {
@@ -982,20 +1036,27 @@ int unload(int fd, int drive, int slot)
          } else {
            pDev[INDEX_TAPE].functions->function_rewind(INDEX_TAPE);
          }
-         
+
          if (pDev[INDEX_TAPE].devopen == 1)
            {
              SCSI_CloseDevice(INDEX_TAPE);
            }
-         
+
          chgscsi_result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &chgscsi_datestamp, &chgscsi_label);
-       } 
+       }
     }
 
   /*
    * Do the unload/move
    */
-  ret = pDev[INDEX_CHANGER].functions->function_move(INDEX_CHANGER , pDTE[drive].address, pSTE[slot].address);
+  if (pDev[INDEX_CHANGER].functions->function_move(INDEX_CHANGER,
+           pDTE[drive].address, pSTE[slot].address) != 0) {
+      DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP unload (-1 move failed)\n");
+      free(pbarcoderes);
+      return(-1);
+      /*NOTREACHED*/
+    }
+
 
   /*
    * Update the Status
@@ -1003,37 +1064,41 @@ int unload(int fd, int drive, int slot)
   if (pDev[INDEX_CHANGER].functions->function_status(INDEX_CHANGER , 1) != 0)
     {
       DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP unload (-1 update status failed)\n");
+      free(pbarcoderes);
       return(-1);
+      /*NOTREACHED*/
     }
-     
+
   /*
    * Did we get an error from tape_rdlabel
    * if no update the vol/label mapping
    * If chgscsi_label is NULL don't do it
    */
-  if (chgscsi_result  == NULL && chgscsi_label != NULL && chg.labelfile != NULL)
+  if (chgscsi_result  == NULL && chgscsi_label != NULL && changer->labelfile != NULL)
   {
     /*
      * OK this is only needed if we have emubarcode set
      * There we need an exact inventory to get the search function working
      * and returning correct results
      */
-    if (BarCode(INDEX_CHANGER) == 0 && chg.emubarcode == 1)
+    if (BarCode(INDEX_CHANGER) == 0 && changer->emubarcode == 1)
       {
-       /* 
+       /*
         * We got something, update the db
         * but before check if the db has as entry the slot
         * to where we placed the tape, if no force an inventory
         */
        pbarcoderes->action = FIND_SLOT;
-       strcpy(pbarcoderes->data.voltag, chgscsi_label);
-       strcpy(pbarcoderes->data.barcode, pSTE[slot].VolTag );
+       strncpy(pbarcoderes->data.voltag, chgscsi_label,
+               SIZEOF(pbarcoderes->data.voltag));
+       strncpy(pbarcoderes->data.barcode, pSTE[slot].VolTag,
+              SIZEOF(pbarcoderes->data.barcode));
        pbarcoderes->data.slot = 0;
        pbarcoderes->data.from = 0;
        pbarcoderes->data.LoadCount = 0;
-       
-       
-       if ( MapBarCode(chg.labelfile, pbarcoderes) == 0) /* Nothing known about this, do an Inventory */
+
+
+       if ( MapBarCode(changer->labelfile, pbarcoderes) == 0) /* Nothing known about this, do an Inventory */
          {
            do_inventory = 1;
          } else {
@@ -1047,6 +1112,7 @@ int unload(int fd, int drive, int slot)
   }
 
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP unload(0)\n");
+  free(pbarcoderes);
   return(0);
 }
 
@@ -1061,20 +1127,22 @@ int unload(int fd, int drive, int slot)
  * return -> 0 = success
  *           !0 = failure
  */
-int load(int fd, int drive, int slot)
+int
+load(
+    int                fd,
+    int                drive,
+    int                slot)
 {
-  extern changer_t chg;         /* Needed for the infos about emubarcode and labelfile */
   char *result = NULL;          /* Needed for the result of tape_rdlabel */
-  char *datestamp = NULL;       /* Result pointer for tape_rdlabel */       
-  char *label = NULL;           /* Result pointer for tape_rdlabel */
   int ret;
   extern OpenFiles_T *pDev;
   extern int do_inventory;
-  MBC_T *pbarcoderes = malloc(sizeof(MBC_T));
+  MBC_T *pbarcoderes;
 
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"###### START load\n");
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"%-20s : fd %d, drive %d, slot %d \n", "load", fd, drive, slot);
-  memset(pbarcoderes, 0 , sizeof(MBC_T));
+  pbarcoderes = alloc(SIZEOF(MBC_T));
+  memset(pbarcoderes, 0 , SIZEOF(MBC_T));
 
   if (ElementStatusValid == 0)
       {
@@ -1082,7 +1150,9 @@ int load(int fd, int drive, int slot)
               {
                DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"##### STOP load (-1)\n");
                DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"##### STOP load (-1 update status failed)\n");
+               free(pbarcoderes);
                return(-1);
+               /*NOTREACHED*/
               }
       }
 
@@ -1092,40 +1162,46 @@ int load(int fd, int drive, int slot)
    * is ge than the value we got from the ModeSense fail with an return value
    * of 2
    */
-  if (slot >= STE)
+  if ((size_t)slot >= STE)
     {
-      DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"load : slot %d ge STE %d\n",slot, STE); 
+      DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"load : slot %d ge STE %d\n",slot, STE);
       ChgExit("load", "slot >= STE", FATAL);
+      /*NOTREACHED*/
     }
-  
-  /* 
+
+  /*
    * And the same for the tape drives
    */
-  if (drive >= DTE)
+  if (drive >= (int)DTE)
     {
-      DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"load : drive %d ge DTE %d\n",drive, DTE); 
+      DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"load : drive %d ge DTE %d\n",drive, DTE);
       ChgExit("load", "drive >= DTE", FATAL);
+      /*NOTREACHED*/
     }
 
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"load : load drive %d[%d] slot %d[%d]\n",drive,
             pDTE[drive].address,
             slot,
             pSTE[slot].address);
-  
+
   if (pDTE[drive].status == 'F')
     {
       DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"load : Drive %d address %d is full\n", drive, pDTE[drive].address);
       DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"##### STOP load (-1 update status failed)\n");
+      free(pbarcoderes);
       return(-1);
+      /*NOTREACHED*/
     }
-  
+
   if (pSTE[slot].status == 'E')
     {
       DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"load : Slot %d address %d is empty\n", drive, pSTE[slot].address);
       DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"##### STOP load (-1 update status failed)\n");
+      free(pbarcoderes);
       return(-1);
+      /*NOTREACHED*/
     }
-  
+
   ret = pDev[fd].functions->function_move(fd, pSTE[slot].address, pDTE[drive].address);
 
   /*
@@ -1134,14 +1210,16 @@ int load(int fd, int drive, int slot)
   if (pDev[fd].functions->function_status(fd, 1) != 0)
       {
        DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"##### STOP load (-1 update status failed)\n");
+       free(pbarcoderes);
        return(-1);
+       /*NOTREACHED*/
       }
 
   /*
    * Try to read the label
    * and update the label/slot database
    */
-  if (pDev[INDEX_TAPE].avail == 1 && (chg.emubarcode == 1 || BarCode(INDEX_CHANGER)))
+  if (pDev[INDEX_TAPE].avail == 1 && (changer->emubarcode == 1 || BarCode(INDEX_CHANGER)))
     {
 
       if (pDev[INDEX_TAPECTL].SCSI == 1 && pDev[INDEX_TAPECTL].avail) {
@@ -1149,51 +1227,53 @@ int load(int fd, int drive, int slot)
       } else {
        pDev[INDEX_TAPE].functions->function_rewind(INDEX_TAPE);
       }
-      
+
       if (pDev[INDEX_TAPE].devopen == 1)
        {
          SCSI_CloseDevice(INDEX_TAPE);
        }
-      
-      result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &datestamp, &label);
+
+      result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &chgscsi_datestamp, &chgscsi_label);
     }
-  
+
   /*
    * Did we get an error from tape_rdlabel
    * if no update the vol/label mapping
    */
-  if (result  == NULL && chg.labelfile != NULL && label != NULL )
+  if (result  == NULL && changer->labelfile != NULL && chgscsi_label != NULL )
     {
-      /* 
+      /*
        * We got something, update the db
        * but before check if the db has as entry the slot
        * to where we placed the tape, if no force an inventory
        */
-      strcpy(pbarcoderes->data.voltag, label);
+      strncpy(pbarcoderes->data.voltag, chgscsi_label,
+             SIZEOF(pbarcoderes->data.voltag));
       pbarcoderes->data.slot = 0;
       pbarcoderes->data.from = 0;
       pbarcoderes->data.LoadCount = 0;
-      
-      
+
+
       /*
        * If we have an barcode reader we only do an update
        * If emubarcode is set we check if the
        * info in the DB is up to date, if no we set the do_inventory flag
        */
-      
-      if (BarCode(INDEX_CHANGER) == 1 && chg.emubarcode == 0)
+
+      if (BarCode(INDEX_CHANGER) == 1 && changer->emubarcode == 0)
        {
          pbarcoderes->action = UPDATE_SLOT;
-         strcpy(pbarcoderes->data.barcode, pDTE[drive].VolTag);
+         strncpy(pbarcoderes->data.barcode, pDTE[drive].VolTag,
+                 SIZEOF(pbarcoderes->data.barcode));
          pbarcoderes->data.LoadCount = 1;
          pbarcoderes->data.slot = slot;
-         MapBarCode(chg.labelfile, pbarcoderes);
+         MapBarCode(changer->labelfile, pbarcoderes);
        }
-      
-      if (BarCode(INDEX_CHANGER) == 0 && chg.emubarcode == 1)
+
+      if (BarCode(INDEX_CHANGER) == 0 && changer->emubarcode == 1)
        {
          pbarcoderes->action = FIND_SLOT;
-         if (MapBarCode(chg.labelfile, pbarcoderes) == 0) /* Nothing found, do an inventory */
+         if (MapBarCode(changer->labelfile, pbarcoderes) == 0) /* Nothing found, do an inventory */
            {
              do_inventory = 1;
            } else { /* We got something, is it correct ? */
@@ -1201,24 +1281,29 @@ int load(int fd, int drive, int slot)
                {
                  DebugPrint(DEBUG_ERROR, SECTION_TAPE,"Slot DB out of sync, slot %d != map %d",slot, pbarcoderes->data.slot);
                  ChgExit("Load", "Label DB out of sync", FATAL);
+                 /*NOTREACHED*/
                } else { /* OK, so increment the load count */
                  pbarcoderes->action = UPDATE_SLOT;
                  pbarcoderes->data.LoadCount = 1;
                  pbarcoderes->data.slot = slot;
-                 MapBarCode(chg.labelfile, pbarcoderes);
+                 MapBarCode(changer->labelfile, pbarcoderes);
                }
            }
        }
-      
-      if (BarCode(INDEX_CHANGER) == 1 && chg.emubarcode == 1)
+
+      if (BarCode(INDEX_CHANGER) == 1 && changer->emubarcode == 1)
        {
          ChgExit("Load", "BarCode == 1 and emubarcode == 1", FATAL);
+         /*NOTREACHED*/
        }
-      
+
       DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"##### STOP load (%d)\n",ret);
+      free(pbarcoderes);
       return(ret);
+      /*NOTREACHED*/
     }
     DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"##### STOP load (%d)\n",ret);
+    free(pbarcoderes);
     return(ret);
 }
 
@@ -1226,8 +1311,10 @@ int load(int fd, int drive, int slot)
  * Returns the number of Storage Slots which the library has
  * fd -> pointer to the internal devie structure pDev
  * return -> Number of slots
- */ 
-int get_slot_count(int fd)
+ */
+int
+get_slot_count(
+    int fd)
 {
   extern OpenFiles_T *pDev;
 
@@ -1238,13 +1325,14 @@ int get_slot_count(int fd)
     {
       pDev[fd].functions->function_status(fd, 1);
     }
-  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"##### STOP get_slot_count (%d)\n",STE);
-  return(STE);
+  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,
+            "##### STOP get_slot_count (" SIZE_T_FMT ")\n",
+            (SIZE_T_FMT_TYPE)STE);
+  return((ssize_t)STE);
   /*
    * return the number of slots in the robot
    * to the caller
    */
-  
 }
 
 
@@ -1252,8 +1340,10 @@ int get_slot_count(int fd)
  * retreive the number of data-transfer devices /Tape drives)
  * fd     -> pointer to the internal devie structure pDev
  * return -> -1 on failure
- */ 
-int get_drive_count(int fd)
+ */
+int
+get_drive_count(
+    int fd)
 {
 
   extern OpenFiles_T *pDev;
@@ -1261,7 +1351,6 @@ int get_drive_count(int fd)
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"###### START get_drive_count\n");
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"%-20s : fd %d\n", "get_drive_count", fd);
 
-
   if (ElementStatusValid == 0)
       {
           if ( pDev[fd].functions->function_status(fd, 1) != 0)
@@ -1269,10 +1358,13 @@ int get_drive_count(int fd)
                DebugPrint(DEBUG_ERROR, SECTION_SCSI, "Error getting drive count\n");
                DebugPrint(DEBUG_ERROR, SECTION_SCSI, "##### STOP get_drive_count (-1)\n");
                return(-1);
+               /*NOTREACHED*/
            }
       }
-  DebugPrint(DEBUG_INFO, SECTION_SCSI,"###### STOP get_drive_count (%d drives)\n",DTE);
-  return(DTE);
+  DebugPrint(DEBUG_INFO, SECTION_SCSI,
+            "###### STOP get_drive_count (" SIZE_T_FMT " drives)\n",
+            (SIZE_T_FMT_TYPE)DTE);
+  return((ssize_t)DTE);
 }
 
 /*
@@ -1284,17 +1376,27 @@ int get_drive_count(int fd)
  * The OS has to decide if it is an SCSI Commands capable device
  */
 
-int OpenDevice(int ip , char *DeviceName, char *ConfigName, char *ident)
+int
+OpenDevice(
+    int                ip,
+    char *     DeviceName,
+    char *     ConfigName,
+    char *     ident)
 {
   extern OpenFiles_T *pDev;
   char tmpstr[15];
   ChangerCMD_T *p = (ChangerCMD_T *)&ChangerIO;
-  
+
+  if (!ConfigName)
+       return 1;
+  if (!DeviceName)
+       return 1;
+
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START OpenDevice\n");
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"OpenDevice : %s\n", DeviceName);
-  
-  pDev[ip].ConfigName = stralloc(ConfigName);
-  pDev[ip].dev = stralloc(DeviceName);
+
+  pDev[ip].ConfigName = strdup(ConfigName);
+  pDev[ip].dev = strdup(DeviceName);
 
   if (SCSI_OpenDevice(ip) != 0 )
     {
@@ -1309,10 +1411,12 @@ int OpenDevice(int ip , char *DeviceName, char *ConfigName, char *ident)
                 DebugPrint(DEBUG_INFO, SECTION_SCSI,"override using ident = %s, type = %s\n",p->ident, p->type);
                DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP OpenDevice\n");
                 return(1);
+               /*NOTREACHED*/
               }
             p++;
           }
          ChgExit("OpenDevice", "ident not found", FATAL);
+         /*NOTREACHED*/
       } else {
         while(p->ident != NULL)
           {
@@ -1322,6 +1426,7 @@ int OpenDevice(int ip , char *DeviceName, char *ConfigName, char *ident)
                 DebugPrint(DEBUG_INFO, SECTION_SCSI,"using ident = %s, type = %s\n",p->ident, p->type);
                DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP OpenDevice\n");
                 return(1);
+               /*NOTREACHED*/
               }
             p++;
           }
@@ -1330,7 +1435,7 @@ int OpenDevice(int ip , char *DeviceName, char *ConfigName, char *ident)
       /* divide generic in generic_type, where type is the */
       /* num returned by the inquiry command */
       p = (ChangerCMD_T *)&ChangerIO;
-      sprintf(&tmpstr[0],"%s_%s","generic",pDev[0].type);
+      snprintf(&tmpstr[0], SIZEOF(tmpstr), "%s_%s","generic",pDev[0].type);
       while(p->ident != NULL)
         {
           if (strcmp(tmpstr, p->ident) == 0)
@@ -1339,14 +1444,15 @@ int OpenDevice(int ip , char *DeviceName, char *ConfigName, char *ident)
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"using ident = %s, type = %s\n",p->ident, p->type);
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP OpenDevice\n");
               return(1);
+             /*NOTREACHED*/
             }
           p++;
-        }  
+        }
     } else { /* Something failed, lets see what */
       DebugPrint(DEBUG_ERROR, SECTION_SCSI,"##### STOP OpenDevice failed\n");
     }
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP OpenDevice (nothing found) !!\n");
-  return(0); 
+  return(0);
 }
 
 
@@ -1354,9 +1460,11 @@ int OpenDevice(int ip , char *DeviceName, char *ConfigName, char *ident)
  * This functions checks if the library has an barcode reader.
  * fd     -> pointer to the internal devie structure pDev
  */
-int BarCode(int fd)
+int
+BarCode(
+    int                fd)
 {
-  int ret = 0;
+  int ret;
   extern OpenFiles_T *pDev;
 
   DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### START BarCode\n");
@@ -1377,18 +1485,21 @@ int BarCode(int fd)
  * wait -> time to wait for the ready status
  *
  */
-int Tape_Ready(int fd, int wait_time)
+int
+Tape_Ready(
+    int                fd,
+    time_t     wait_time)
 {
   extern OpenFiles_T *pDev;
-  int true = 1;
+  int done;
   int ret;
-  int cnt = 0;
-  
+  time_t cnt = 0;
+
   RequestSense_T *pRequestSense;
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### START Tape_Ready\n");
-  
+
   /*
-   * Which device should we use to get the 
+   * Which device should we use to get the
    * tape status
    */
 
@@ -1399,7 +1510,7 @@ int Tape_Ready(int fd, int wait_time)
     {
       fd = INDEX_TAPE;
     }
-  
+
   /*
    * But if available and can do SCSI
    * the scsitapedev
@@ -1408,14 +1519,14 @@ int Tape_Ready(int fd, int wait_time)
     {
       fd = INDEX_TAPECTL;
     }
-  
+
   if (pDev[fd].avail == 1 && pDev[fd].SCSI == 0)
     {
       DebugPrint(DEBUG_INFO, SECTION_TAPE,"Tape_Ready : Can't send SCSI commands, try ioctl\n");
       /*
        * Do we get an non negative result.
        * If yes this function is available
-       * and we can use it to get the status 
+       * and we can use it to get the status
        * of the tape
        */
       ret = Tape_Status(fd);
@@ -1428,6 +1539,7 @@ int Tape_Ready(int fd, int wait_time)
                  DebugPrint(DEBUG_INFO, SECTION_TAPE,"Tape_Ready : Ready after %d seconds\n",cnt);
                  DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP Tape_Ready\n");
                  return(0);
+                 /*NOTREACHED*/
                }
              cnt++;
              sleep(1);
@@ -1437,70 +1549,69 @@ int Tape_Ready(int fd, int wait_time)
          DebugPrint(DEBUG_INFO, SECTION_TAPE,"Tape_Ready : not ready, stop after %d seconds\n",cnt);
          DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP Tape_Ready\n");
          return(0);
-         
-       } else {
-         DebugPrint(DEBUG_INFO, SECTION_TAPE,"Tape_Ready : no ioctl interface, will sleep for %d seconds\n", wait_time);
-         sleep(wait_time);
-         DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP Tape_Ready\n");
-         return(0);
+         /*NOTREACHED*/
+
        }
+       DebugPrint(DEBUG_INFO, SECTION_TAPE,"Tape_Ready : no ioctl interface, will sleep for %d seconds\n", wait_time);
+       sleep(wait_time);
+       DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP Tape_Ready\n");
+       return(0);
+       /*NOTREACHED*/
     }
-  
-  if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-    {
-      DebugPrint(DEBUG_INFO, SECTION_TAPE,"Tape_Ready : malloc failed\n");
-      DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP Tape_Ready\n");
-      return(-1);
-    }
-  
+
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
+
   /*
    * Ignore errors at this point
    */
   GenericRewind(fd);
-  
+
   /*
    * Wait until we get an ready condition
    */
-  
-  while (true && cnt < wait_time)
+
+  done = 0;
+  while (!done && (cnt < wait_time))
     {
       ret = SCSI_TestUnitReady(fd, pRequestSense );
       switch (ret)
        {
        case SCSI_OK:
-         true = 0;
+         done = 1;
          break;
        case SCSI_SENSE:
-         switch (SenseHandler(fd, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+         switch (SenseHandler(fd, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
            {
            case SENSE_NO:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeReady (TestUnitReady) SENSE_NO\n");
-             true=0;
+             done = 1;
              break;
            case SENSE_TAPE_NOT_ONLINE:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeReady (TestUnitReady) SENSE_TAPE_NOT_ONLINE\n");
              break;
            case SENSE_IGNORE:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeReady (TestUnitReady) SENSE_IGNORE\n");
-             true = 0;
+             done = 1;
              break;
            case SENSE_ABORT:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"TapeReady (TestUnitReady) SENSE_ABORT\n");
+             amfree(pRequestSense);
              return(-1);
-             break;
+             /*NOTREACHED*/
            case SENSE_RETRY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeReady (TestUnitReady) SENSE_RETRY\n");
              break;
            default:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeReady (TestUnitReady) default (SENSE)\n");
-             true=0;
+             done = 1;
              break;
            }
          break;
        case SCSI_ERROR:
          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"TapeReady (TestUnitReady) SCSI_ERROR\n");
+         free(pRequestSense);
          return(-1);
-         break;
+         /*NOTREACHED*/
        case SCSI_BUSY:
          DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeReady (TestUnitReady) SCSI_BUSY\n");
          break;
@@ -1515,15 +1626,17 @@ int Tape_Ready(int fd, int wait_time)
       cnt++;
     }
 
-  free(pRequestSense);
-
+  amfree(pRequestSense);
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"Tape_Ready after %d sec\n", cnt);
-  DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP Tape_Ready\n"); 
+  DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP Tape_Ready\n");
   return(0);
 }
 
 
-int DecodeSCSI(CDB_T CDB, char *string)
+int
+DecodeSCSI(
+    CDB_T      CDB,
+    char *     string)
 {
   SC_COM_T *pSCSICommand;
   int x;
@@ -1543,6 +1656,7 @@ int DecodeSCSI(CDB_T CDB, char *string)
           DebugPrint(DEBUG_INFO, SECTION_SCSI,"\n");
           DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP DecodeSCSI\n");
           return(0);
+         /*NOTREACHED*/
        }
       pSCSICommand++;
     }
@@ -1551,11 +1665,19 @@ int DecodeSCSI(CDB_T CDB, char *string)
   return(0);
 }
 
-int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *out)
+int
+DecodeModeSense(
+    u_char *   buffer,
+    size_t     offset,
+    char *     pstring,
+    char       block,
+    FILE *     out)
 {
   ReadWriteErrorRecoveryPage_T *prp;
   DisconnectReconnectPage_T *pdrp;
-  int length = (unsigned char)*buffer - 4 - offset;
+  size_t length = (size_t)buffer[0] - 4 - offset;
+
+  (void)pstring;       /* Quiet unused parameter warning */
 
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START DecodeModeSense\n");
 
@@ -1563,7 +1685,7 @@ int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *o
 
   /* Jump over the Parameter List header  and an offset if we have something
    * Unknown at the start (ADIC-218) at the moment
-   * 
+   *
    */
   buffer = buffer + 4 + offset;
 
@@ -1572,7 +1694,7 @@ int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *o
   if (block) /* Do we have an block descriptor page ?*/
     {
       if (out != NULL)
-        fprintf(out, "DecodeModeSense : Density Code %x\n", buffer[0]);
+        fprintf(out, "DecodeModeSense : Density Code %x\n", (unsigned)buffer[0]);
       buffer++;
 
       if (out != NULL)
@@ -1583,7 +1705,7 @@ int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *o
        fprintf(out, "DecodeModeSense : Block Length %d\n", V3(buffer));
       buffer = buffer + 3;
     }
-  
+
   while (length > 0)
     {
       switch (*buffer & 0x3f)
@@ -1595,7 +1717,7 @@ int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *o
         case 0x1:
           prp = (ReadWriteErrorRecoveryPage_T *)buffer;
          if (out != NULL)
-          { 
+          {
                fprintf(out, "DecodeModeSense : Read/Write Error Recovery Page\n");
                fprintf(out,"\tTransfer Block            %d\n", prp->tb);
                fprintf(out,"\tEnable Early Recovery     %d\n", prp->eer);
@@ -1614,9 +1736,9 @@ int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *o
                fprintf(out, "DecodeModeSense : Disconnect/Reconnect Page\n");
                fprintf(out,"\tBuffer Full Ratio     %d\n", pdrp->BufferFullRatio);
                fprintf(out,"\tBuffer Empty Ratio    %d\n", pdrp->BufferEmptyRatio);
-               fprintf(out,"\tBus Inactivity Limit  %d\n", 
+               fprintf(out,"\tBus Inactivity Limit  %d\n",
                   V2(pdrp->BusInactivityLimit));
-               fprintf(out,"\tDisconnect Time Limit %d\n", 
+               fprintf(out,"\tDisconnect Time Limit %d\n",
                   V2(pdrp->DisconnectTimeLimit));
                fprintf(out,"\tConnect Time Limit    %d\n",
                   V2(pdrp->ConnectTimeLimit));
@@ -1631,21 +1753,21 @@ int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *o
          if (out != NULL)
          {
                fprintf(out,"DecodeModeSense : Element Address Assignment Page\n");
-               fprintf(out,"\tMedium Transport Element Address     %d\n", 
+               fprintf(out,"\tMedium Transport Element Address     %d\n",
                     V2(pEAAPage->MediumTransportElementAddress));
-               fprintf(out,"\tNumber of Medium Transport Elements  %d\n", 
+               fprintf(out,"\tNumber of Medium Transport Elements  %d\n",
                     V2(pEAAPage->NoMediumTransportElements));
-               fprintf(out, "\tFirst Storage Element Address       %d\n", 
+               fprintf(out, "\tFirst Storage Element Address       %d\n",
                     V2(pEAAPage->FirstStorageElementAddress));
-               fprintf(out, "\tNumber of  Storage Elements         %d\n", 
+               fprintf(out, "\tNumber of  Storage Elements         %d\n",
                     V2(pEAAPage->NoStorageElements));
-               fprintf(out, "\tFirst Import/Export Element Address %d\n", 
+               fprintf(out, "\tFirst Import/Export Element Address %d\n",
                     V2(pEAAPage->FirstImportExportElementAddress));
-               fprintf(out, "\tNumber of  ImportExport Elements    %d\n", 
+               fprintf(out, "\tNumber of  ImportExport Elements    %d\n",
                     V2(pEAAPage->NoImportExportElements));
-               fprintf(out, "\tFirst Data Transfer Element Address %d\n", 
+               fprintf(out, "\tFirst Data Transfer Element Address %d\n",
                     V2(pEAAPage->FirstDataTransferElementAddress));
-               fprintf(out, "\tNumber of  Data Transfer Elements   %d\n", 
+               fprintf(out, "\tNumber of  Data Transfer Elements   %d\n",
                     V2(pEAAPage->NoDataTransferElements));
          }
           buffer++;
@@ -1705,18 +1827,24 @@ int DecodeModeSense(char *buffer, int offset, char *pstring, char block, FILE *o
           /*           EAAPage = NULL; */
           /*           DeviceCapabilitiesPage = NULL; */
           return(-1);
+         /*NOTREACHED*/
         }
-      length = length - *buffer - 2;
-      buffer = buffer + *buffer + 1;      
+      length = length - (size_t)*buffer - 2;
+      buffer = buffer + (size_t)*buffer + 1;
     }
   return(0);
 }
 
-int DecodeSense(RequestSense_T *sense, char *pstring, FILE *out)
+int
+DecodeSense(
+    RequestSense_T *   sense,
+    char *             pstring,
+    FILE *             out)
 {
   if (out == NULL)
     {
       return(0);
+      /*NOTREACHED*/
     }
   fprintf(out,"##### START DecodeSense\n");
   fprintf(out,"%sSense Keys\n", pstring);
@@ -1781,10 +1909,14 @@ int DecodeSense(RequestSense_T *sense, char *pstring, FILE *out)
       fprintf(out,"\t\tReserved\n");
       break;
     }
-  return(0);      
+  return(0);
 }
 
-int DecodeExtSense(ExtendedRequestSense_T *sense, char *pstring, FILE *out)
+int
+DecodeExtSense(
+    ExtendedRequestSense_T *   sense,
+    char *                     pstring,
+    FILE *                     out)
 {
   ExtendedRequestSense_T *p;
 
@@ -1796,8 +1928,8 @@ int DecodeExtSense(ExtendedRequestSense_T *sense, char *pstring, FILE *out)
   fprintf(out,"\tLog Parameter Page Code         %02X\n", sense->LogParameterPageCode);
   fprintf(out,"\tLog Parameter Code              %02X\n", sense->LogParameterCode);
   fprintf(out,"\tUnderrun/Overrun Counter        %02X\n", sense->UnderrunOverrunCounter);
-  fprintf(out,"\tRead/Write Error Counter        %d\n", V3((char *)sense->ReadWriteDataErrorCounter)); 
-  if (sense->AdditionalSenseLength > sizeof(RequestSense_T))
+  fprintf(out,"\tRead/Write Error Counter        %d\n", V3((char *)sense->ReadWriteDataErrorCounter));
+  if (sense->AdditionalSenseLength > (u_char)sizeof(RequestSense_T))
     {
       if (sense->PF)
         fprintf(out,"\tPower Fail\n");
@@ -1851,7 +1983,9 @@ int DecodeExtSense(ExtendedRequestSense_T *sense, char *pstring, FILE *out)
   return(0);
 }
 
-int PrintInquiry(SCSIInquiry_T *SCSIInquiry)
+int
+PrintInquiry(
+    SCSIInquiry_T *    SCSIInquiry)
 {
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START PrintInquiry\n");
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"%-15s %x\n", "qualifier", SCSIInquiry->qualifier);
@@ -1870,25 +2004,66 @@ int PrintInquiry(SCSIInquiry_T *SCSIInquiry)
 }
 
 
-int DoNothing()
+int
+DoNothing0(void)
+{
+  dbprintf(("##### START DoNothing\n"));
+  return(0);
+}
+
+int
+DoNothing1(
+    int                unused1)
+{
+  (void)unused1;       /* Quiet unused parameter warning */
+
+  dbprintf(("##### START DoNothing\n"));
+  return(0);
+}
+
+int
+DoNothing2(
+    int                unused1,
+    int                unused2)
+{
+  (void)unused1;       /* Quiet unused parameter warning */
+  (void)unused2;       /* Quiet unused parameter warning */
+
+  dbprintf(("##### START DoNothing\n"));
+  return(0);
+}
+
+int
+DoNothing3(
+    int                unused1,
+    int                unused2,
+    int                unused3)
 {
+  (void)unused1;       /* Quiet unused parameter warning */
+  (void)unused2;       /* Quiet unused parameter warning */
+  (void)unused3;       /* Quiet unused parameter warning */
+
   dbprintf(("##### START DoNothing\n"));
   return(0);
 }
 
-int GenericFree()
+int
+GenericFree(void)
 {
   dbprintf(("##### START GenericFree\n"));
   return(0);
 }
 
-int GenericSearch()
+int
+GenericSearch(void)
 {
   dbprintf(("##### START GenericSearch\n"));
   return(0);
 }
 
-int TreeFrogBarCode(int DeviceFD)
+int
+TreeFrogBarCode(
+    int DeviceFD)
 {
   extern OpenFiles_T *pDev;
 
@@ -1897,34 +2072,34 @@ int TreeFrogBarCode(int DeviceFD)
   dbprintf(("##### START TreeFrogBarCode\n"));
   if (pModePage == NULL)
     {
-      if ((pModePage = malloc(0xff)) == NULL)
-        {
-          dbprintf(("TreeFrogBarCode : malloc failed\n"));
-          return(-1);
-        }
+      pModePage = alloc(0xff);
     }
-  
+
   if (SCSI_ModeSense(DeviceFD, pModePage, 0xff, 0x0, 0x3f) == 0)
     {
       DecodeModeSense(pModePage, 0, "TreeFrogBarCode :", 0, debug_file);
-      
+
       if (pVendorUnique == NULL)
       {
          dbprintf(("TreeFrogBarCode : no pVendorUnique\n"));
          return(0);
+        /*NOTREACHED*/
       }
       pVendor = ( ModePageTreeFrogVendorUnique_T *)pVendorUnique;
-    
+
       dbprintf(("TreeFrogBarCode : EBARCO %d\n", pVendor->EBARCO));
       dbprintf(("TreeFrogCheckSum : CHKSUM  %d\n", pVendor->CHKSUM));
 
-      dump_hex((char *)pDev[INDEX_CHANGER].inquiry, INQUIRY_SIZE, DEBUG_INFO, SECTION_ELEMENT);
+      dump_hex((u_char *)pDev[INDEX_CHANGER].inquiry, INQUIRY_SIZE, DEBUG_INFO, SECTION_ELEMENT);
       return(pVendor->EBARCO);
+      /*NOTREACHED*/
     }
   return(0);
 }
 
-int EXB_BarCode(int DeviceFD)
+int
+EXB_BarCode(
+    int                DeviceFD)
 {
   extern OpenFiles_T *pDev;
 
@@ -1934,11 +2109,8 @@ int EXB_BarCode(int DeviceFD)
   DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### START EXB_BarCode\n");
   if (pModePage == NULL && LibModeSenseValid == 0)
     {
-      if ((pModePage = malloc(0xff)) == NULL)
-        {
-          DebugPrint(DEBUG_ERROR, SECTION_BARCODE,"EXB_BarCode : malloc failed\n");
-          return(-1);
-        }
+      pModePage = alloc(0xff);
+
       if (SCSI_ModeSense(DeviceFD, pModePage, 0xff, 0x8, 0x3f) == 0)
        {
          DecodeModeSense(pModePage, 0, "EXB_BarCode :", 0, debug_file);
@@ -1947,74 +2119,85 @@ int EXB_BarCode(int DeviceFD)
          LibModeSenseValid = -1;
        }
     }
-  
+
   if (LibModeSenseValid == 1)
     {
       if (pVendorUnique == NULL)
        {
          DebugPrint(DEBUG_INFO, SECTION_BARCODE,"EXB_BarCode : no pVendorUnique\n");
          return(0);
+        /*NOTREACHED*/
       }
       pVendor = ( ModePageEXB120VendorUnique_T *)pVendorUnique;
-    
+
       DebugPrint(DEBUG_INFO, SECTION_BARCODE,"EXB_BarCode : NBL %d\n", pVendor->NBL);
       DebugPrint(DEBUG_INFO, SECTION_BARCODE,"EXB_BarCode : PS  %d\n", pVendor->PS);
       if (pVendor->NBL == 1 && pVendor->PS == 1 )
         {
-          if ((pVendorWork = ( ModePageEXB120VendorUnique_T *)malloc(pVendor->ParameterListLength + 2)) == NULL)
-            {
-              DebugPrint(DEBUG_ERROR, SECTION_BARCODE,"EXB_BarCode : malloc failed\n");
-              return(-1);
-            }
+          pVendorWork = alloc((size_t)pVendor->ParameterListLength + 2);
           DebugPrint(DEBUG_INFO, SECTION_BARCODE,"EXB_BarCode : setting NBL to 1\n");
-          memcpy(pVendorWork, pVendor, pVendor->ParameterListLength + 2);
+          memcpy(pVendorWork, pVendor, (size_t)pVendor->ParameterListLength + 2);
           pVendorWork->NBL = 0;
           pVendorWork->PS = 0;
           pVendorWork->RSVD0 = 0;
-          if (SCSI_ModeSelect(DeviceFD, (char *)pVendorWork, pVendorWork->ParameterListLength + 2, 0, 1, 0) == 0)
+          if (SCSI_ModeSelect(DeviceFD, (u_char *)pVendorWork, (u_char)(pVendorWork->ParameterListLength + 2), 0, 1, 0) == 0)
             {
               DebugPrint(DEBUG_INFO, SECTION_BARCODE,"EXB_BarCode : SCSI_ModeSelect OK\n");
               /* Hack !!!!!!
                */
               pVendor->NBL = 0;
-              
+
               /* And now again !!!
                */
               GenericResetStatus(DeviceFD);
             } else {
               DebugPrint(DEBUG_INFO, SECTION_BARCODE,"EXB_BarCode : SCSI_ModeSelect failed\n");
             }
+            amfree(pVendorWork);
         }
-      dump_hex((char *)pDev[INDEX_CHANGER].inquiry, INQUIRY_SIZE, DEBUG_INFO, SECTION_BARCODE);
+      dump_hex((u_char *)pDev[INDEX_CHANGER].inquiry, INQUIRY_SIZE, DEBUG_INFO, SECTION_BARCODE);
       DebugPrint(DEBUG_INFO, SECTION_BARCODE,"EXB_BarCode : vendor_specific[19] %x\n",
                 pDev[INDEX_CHANGER].inquiry->vendor_specific[19]);
     }
-  
   return(1);
 }
 
-int NoBarCode(int DeviceFD)
+int
+NoBarCode(
+    int DeviceFD)
 {
+  (void)DeviceFD;      /* Quiet unused parameter warning */
+
   DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### START NoBarCode\n");
   DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP  NoBarCode\n");
   return(0);
 }
 
-int GenericBarCode(int DeviceFD)
+int
+GenericBarCode(
+    int                DeviceFD)
 {
-  extern changer_t chg;
-  
+  (void)DeviceFD;      /* Quiet unused parameter warning */
+
   DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### START GenericBarCode\n");
-  if ( chg.havebarcode  >= 1)
+  if ( changer->havebarcode  >= 1)
     {
-      DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP GenericBarCode (havebarcode) => %d\n",chg.havebarcode);
+      DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP GenericBarCode (havebarcode) => %d\n",changer->havebarcode);
       return(1);
+      /*NOTREACHED*/
     }
   DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP GenericBarCode => 0\n");
   return(0);
 }
 
-int SenseHandler(int DeviceFD, unsigned char flag, unsigned char SenseKey, unsigned char AdditionalSenseCode, unsigned char AdditionalSenseCodeQualifier, char *buffer)
+int
+SenseHandler(
+    int                        DeviceFD,
+    u_char             flag,
+    u_char             SenseKey,
+    u_char             AdditionalSenseCode,
+    u_char             AdditionalSenseCodeQualifier,
+    RequestSense_T *   buffer)
 {
   extern OpenFiles_T *pDev;
   int ret = 0;
@@ -2042,12 +2225,13 @@ int SenseHandler(int DeviceFD, unsigned char flag, unsigned char SenseKey, unsig
  * if there are more than one
  * Implement the SCSI path if available
 */
-int TapeStatus()
+int
+TapeStatus(void)
 {
   extern OpenFiles_T *pDev;
   int ret;
-  int true = 1;
-  int cnt = 0;
+  int done;
+  int cnt;
   RequestSense_T *pRequestSense;
 
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### START TapeStatus\n");
@@ -2059,13 +2243,10 @@ int TapeStatus()
    */
   if (pDev[INDEX_TAPECTL].SCSI == 1)
     {
-      if ((pRequestSense = malloc(sizeof(RequestSense_T))) == NULL)
-       {
-         dbprintf(("%-20s : malloc failed\n","TapeStatus"));
-         return(-1);
-       }
-      
-      while (true && cnt < 60)
+      pRequestSense = alloc(SIZEOF(RequestSense_T));
+      memset(pRequestSense, 0, SIZEOF(RequestSense_T));
+
+      for (done = 0, cnt = 0; !done && (cnt < 60); cnt++)
        {
          ret = SCSI_TestUnitReady(INDEX_TAPECTL, pRequestSense);
          DebugPrint(DEBUG_INFO, SECTION_SCSI, "TapeStatus TestUnitReady ret %d\n",ret);
@@ -2073,55 +2254,65 @@ int TapeStatus()
            {
            case SCSI_OK:
            case SCSI_SENSE:
-             switch (SenseHandler(INDEX_TAPECTL, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+             switch (SenseHandler(INDEX_TAPECTL, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
                {
                case SENSE_IGNORE:
                case SENSE_NO:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeStatus (TestUnitReady) SENSE_NO\n");
                  pDTE[0].status = 'F';
                  DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### FULL\n");
-                 true = 0;
+                 done = 1;
                  break;
+
                case SENSE_TAPE_NOT_ONLINE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeStatus (TestUnitReady) SENSE_TAPE_NOT_ONLINE\n");
                  pDTE[0].status = 'E';
                  DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### EMPTY\n");
-                 true = 0;
+                 done = 1;
                  break;
+
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_SCSI,"TapeStatus (TestUnitReady) SENSE_ABORT\n");
-                 true = 0;
+                 done = 1;
                  break;
+
                case SENSE_RETRY:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeStatus (TestUnitReady) SENSE_RETRY\n");
                  break;
+
                default:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeStatus (TestUnitReady) default (SENSE)\n");
                  break;
                }
              break;
+
            case SCSI_ERROR:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"TapeStatus (TestUnitReady) SCSI_ERROR\n");
-             true = 0;
+             done = 1;
              break;
+
            case SCSI_BUSY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeStatus (TestUnitReady) SCSI_BUSY\n");
              break;
+
            case SCSI_CHECK:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"TapeStatus (TestUnitReady) SCSI_CHECK\n");
              break;
+
            default:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"TapeStatus (TestUnitReady) unknown (%d)\n",ret);
              break;
+
            }
-         sleep(2);
-         cnt++;
+         if (!done)
+           sleep(2);
        }
+        amfree(pRequestSense);
     } else {
       ret = Tape_Status(INDEX_TAPE);
       if ( ret & TAPE_ONLINE)
        {
-         pDTE[0].status ='F'; 
+         pDTE[0].status ='F';
          DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### FULL\n");
        } else {
          pDTE[0].status = 'E';
@@ -2132,7 +2323,10 @@ int TapeStatus()
     return(0);
 }
 
-int DLT4000Eject(char *Device, int type)
+int
+DLT4000Eject(
+    char *     Device,
+    int                type)
 {
   extern OpenFiles_T *pDev;
 
@@ -2140,101 +2334,102 @@ int DLT4000Eject(char *Device, int type)
   ExtendedRequestSense_T *pExtendedRequestSense;
   int ret;
   int cnt = 0;
-  int true = 1;
+  int done;
+
+  (void)Device;        /* Quiet unused parameter warning */
 
   dbprintf(("##### START DLT4000Eject\n"));
 
-  if ((pRequestSense = malloc(sizeof(RequestSense_T))) == NULL)
-    {
-      dbprintf(("%-20s : malloc failed\n","DLT4000Eject"));
-      return(-1);
-    }
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
+  pExtendedRequestSense = alloc(SIZEOF(ExtendedRequestSense_T));
 
-  if ((pExtendedRequestSense = malloc(sizeof(ExtendedRequestSense_T))) == NULL)
-    {
-      dbprintf(("%-20s : malloc failed\n","DLT4000Eject"));
-      return(-1);
-    }
-    
   if ( type > 1)
     {
       dbprintf(("DLT4000Eject : use mtio ioctl for eject on %s\n", pDev[INDEX_TAPE].dev));
+      free(pExtendedRequestSense);
+      free(pRequestSense);
       return(Tape_Ioctl(INDEX_TAPE, IOCTL_EJECT));
+      /*NOTREACHED*/
     }
-  
-  
-  
+
+
+
   if (pDev[INDEX_TAPECTL].SCSI == 0)
     {
       dbprintf(("DLT4000Eject : Device %s not able to receive SCSI commands\n", pDev[INDEX_TAPE].dev));
+      free(pExtendedRequestSense);
+      free(pRequestSense);
       return(Tape_Ioctl(INDEX_TAPE, IOCTL_EJECT));
+      /*NOTREACHED*/
     }
-  
-  
+
+
   dbprintf(("DLT4000Eject : SCSI eject on %s = %s\n", pDev[INDEX_TAPECTL].dev, pDev[INDEX_TAPECTL].ConfigName));
-  
-  RequestSense(INDEX_TAPECTL, pExtendedRequestSense, 0); 
+
+  RequestSense(INDEX_TAPECTL, pExtendedRequestSense, 0);
   DecodeExtSense(pExtendedRequestSense, "DLT4000Eject : ", debug_file);
   /* Unload the tape, 0 ==  wait for success
-   * 0 == unload 
+   * 0 == unload
    */
   ret = SCSI_LoadUnload(INDEX_TAPECTL, pRequestSense, 0, 0);
 
-  RequestSense(INDEX_TAPECTL, pExtendedRequestSense, 0); 
+  RequestSense(INDEX_TAPECTL, pExtendedRequestSense, 0);
   DecodeExtSense(pExtendedRequestSense, "DLT4000Eject : ", debug_file);
-  
+
   /* < 0 == fatal */
-  if (ret < 0)
-    return(-1);
-  
-  if ( ret > 0)
-    {
+  if (ret >= 0) {
+      free(pExtendedRequestSense);
+      free(pRequestSense);
+      return(-1);
+      /*NOTREACHED*/
     }
-  
-  true = 1;
-  
-  
-  while (true && cnt < 300)
+
+  done = 0;
+  while (!done && cnt < 300)
     {
       ret = SCSI_TestUnitReady(INDEX_TAPECTL, pRequestSense);
       DebugPrint(DEBUG_INFO, SECTION_SCSI, "DLT4000Eject TestUnitReady ret %d\n",ret);
       switch (ret)
        {
        case SCSI_OK:
-         true = 0;
+         done = 1;
          break;
        case SCSI_SENSE:
-         switch (SenseHandler(INDEX_TAPECTL, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+         switch (SenseHandler(INDEX_TAPECTL, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
            {
            case SENSE_NO:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"DLT4000Eject (TestUnitReady) SENSE_NO\n");
-             true = 0;
+             done = 1;
              break;
            case SENSE_TAPE_NOT_ONLINE:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"DLT4000Eject (TestUnitReady) SENSE_TAPE_NOT_ONLINE\n");
-             true = 0;
+             done = 1;
              break;
            case SENSE_IGNORE:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"DLT4000Eject (TestUnitReady) SENSE_IGNORE\n");
-             true = 0;
+             done = 1;
              break;
            case SENSE_ABORT:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"DLT4000Eject (TestUnitReady) SENSE_ABORT\n");
+             free(pExtendedRequestSense);
+             free(pRequestSense);
              return(-1);
-             break;
+             /*NOTREACHED*/
            case SENSE_RETRY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"DLT4000Eject (TestUnitReady) SENSE_RETRY\n");
              break;
            default:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"DLT4000Eject (TestUnitReady) default (SENSE)\n");
-             true = 0;
+             done = 1;
              break;
            }
          break;
        case SCSI_ERROR:
          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"DLT4000Eject (TestUnitReady) SCSI_ERROR\n");
+         free(pExtendedRequestSense);
+         free(pRequestSense);
          return(-1);
-         break;
+         /*NOTREACHED*/
        case SCSI_BUSY:
          DebugPrint(DEBUG_INFO, SECTION_SCSI,"DLT4000Eject (TestUnitReady) SCSI_BUSY\n");
          break;
@@ -2245,17 +2440,17 @@ int DLT4000Eject(char *Device, int type)
          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"DLT4000Eject (TestUnitReady) unknown (%d)\n",ret);
          break;
        }
-      
+
       cnt++;
       sleep(2);
     }
-  
-  
+
+  dbprintf(("DLT4000Eject : Ready after %d sec, done = %d\n", cnt * 2, done));
+
+  free(pExtendedRequestSense);
   free(pRequestSense);
-  
-  dbprintf(("DLT4000Eject : Ready after %d sec, true = %d\n", cnt * 2, true));
+
   return(0);
-  
 }
 
 /*
@@ -2266,48 +2461,48 @@ int DLT4000Eject(char *Device, int type)
  * Before unload check if there is an tape in the drive
  *
  */
-int GenericEject(char *Device, int type)
+int
+GenericEject(
+    char *     Device,
+    int                type)
 {
   extern OpenFiles_T *pDev;
   RequestSense_T *pRequestSense;
   int ret;
   int cnt = 0;
-  int true = 1;
-  
+  int done;
+
+  (void)Device;        /* Quiet unused parameter warning */
+  (void)type;  /* Quiet unused parameter warning */
+
   DebugPrint(DEBUG_INFO, SECTION_TAPE, "##### START GenericEject\n");
-  
-  if ((pRequestSense = malloc(sizeof(RequestSense_T))) == NULL)
-    {
-      DebugPrint(DEBUG_ERROR, SECTION_TAPE, "%-20s : malloc failed\n","GenericEject");
-      return(-1);
-    }
-    
-  DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericEject : SCSI eject on %s = %s\n", pDev[INDEX_TAPECTL].dev, pDev[INDEX_TAPECTL].ConfigName);
-  
+
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
+
+  DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericEject : SCSI eject on %s = %s\n",
+             pDev[INDEX_TAPECTL].dev, pDev[INDEX_TAPECTL].ConfigName);
+
   /*
    * Can we use SCSI commands ?
    */
   if (pDev[INDEX_TAPECTL].SCSI == 1)
     {
       LogSense(INDEX_TAPECTL);
-      /* 
+      /*
        * Unload the tape, 1 == don't wait for success
-       * 0 == unload 
+       * 0 == unload
        */
       ret = SCSI_LoadUnload(INDEX_TAPECTL, pRequestSense, 1, 0);
-      
+
       /* < 0 == fatal */
-      if (ret < 0)
+      if (ret < 0) {
+       free(pRequestSense);
        return(-1);
-      
-      if ( ret > 0)
-       {
-       }
-      
-      true = 1;
-      
-      
-      while (true && cnt < 300)
+       /*NOTREACHED*/
+      }
+
+      done = 0;
+      while (!done && cnt < 300)
        {
          ret = SCSI_TestUnitReady(INDEX_TAPECTL, pRequestSense);
          DebugPrint(DEBUG_INFO, SECTION_SCSI, "GenericEject TestUnitReady ret %d\n",ret);
@@ -2315,22 +2510,23 @@ int GenericEject(char *Device, int type)
            {
            case SCSI_OK:
            case SCSI_SENSE:
-             switch (SenseHandler(INDEX_TAPECTL, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+             switch (SenseHandler(INDEX_TAPECTL, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
                {
                case SENSE_NO:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericEject (TestUnitReady) SENSE_NO\n");
                  break;
                case SENSE_TAPE_NOT_ONLINE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericEject (TestUnitReady) SENSE_TAPE_NOT_ONLINE\n");
-                 true = 0;
+                 done = 1;
                  break;
                case SENSE_IGNORE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericEject (TestUnitReady) SENSE_IGNORE\n");
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericEject (TestUnitReady) SENSE_ABORT\n");
+                 free(pRequestSense);
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                case SENSE_RETRY:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericEject (TestUnitReady) SENSE_RETRY\n");
                  break;
@@ -2341,8 +2537,9 @@ int GenericEject(char *Device, int type)
              break;
            case SCSI_ERROR:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericEject (TestUnitReady) SCSI_ERROR\n");
+             free(pRequestSense);
              return(-1);
-             break;
+             /*NOTREACHED*/
            case SCSI_BUSY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericEject (TestUnitReady) SCSI_BUSY\n");
              break;
@@ -2352,23 +2549,22 @@ int GenericEject(char *Device, int type)
            default:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericEject (TestUnitReady) unknown (%d)\n",ret);
              break;
-           }  
+           }
          cnt++;
          sleep(2);
        }
-      
-      free(pRequestSense);
-      
     } else {
       DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericEject : Device can't understand SCSI try ioctl\n");
       Tape_Ioctl(INDEX_TAPECTL, IOCTL_EJECT);
     }
-  DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericEject : Ready after %d sec, true = %d\n", cnt * 2, true);
+  DebugPrint(DEBUG_INFO, SECTION_TAPE,
+            "GenericEject : Ready after %d sec\n", cnt * 2);
+  free(pRequestSense);
   return(0);
 }
 
 /*
- * Rewind the tape 
+ * Rewind the tape
  *
  * TODO:
  * Make the retry counter an config option,
@@ -2377,15 +2573,17 @@ int GenericEject(char *Device, int type)
  * -1 -> error
  * 0  -> success
  */
-int GenericRewind(int DeviceFD)
+int
+GenericRewind(
+    int                DeviceFD)
 {
   CDB_T CDB;
-  extern OpenFiles_T *pDev; 
+  extern OpenFiles_T *pDev;
   RequestSense_T *pRequestSense;
   char *errstr;                    /* Used by tape_rewind */
   int ret;
   int cnt = 0;
-  int true = 1;
+  int done;
 
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### START GenericRewind pDEV -> %d\n",DeviceFD);
 
@@ -2396,57 +2594,59 @@ int GenericRewind(int DeviceFD)
    */
   if (pDev[DeviceFD].SCSI == 1)
     {
-      if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-       {
-          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"GenericRewind : malloc failed\n");
-          return(-1);
-       }
+      pRequestSense = alloc(SIZEOF(RequestSense_T));
+
       /*
        * Before doing the rewind check if the tape is ready to accept commands
        */
-      
-      while (true == 1)
+
+      done = 0;
+      while (!done)
        {
          ret = SCSI_TestUnitReady(DeviceFD, (RequestSense_T *)pRequestSense );
          DebugPrint(DEBUG_INFO, SECTION_TAPE, "GenericRewind (TestUnitReady) ret %d\n",ret);
          switch (ret)
            {
            case SCSI_OK:
-             true= 0;
+             done = 1;
              break;
                    case SCSI_SENSE:
-             switch (SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+             switch (SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
                {
                case SENSE_NO:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_NO\n");
-                 true = 0;
+                 done = 1;
                  break;
                case SENSE_TAPE_NOT_ONLINE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_TAPE_NOT_ONLINE\n");
+                 free(pRequestSense);
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                case SENSE_IGNORE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_IGNORE\n");
-                 true = 0;
+                 done = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_ABORT\n");
+                 free(pRequestSense);
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                case SENSE_RETRY:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_RETRY\n");
                  break;
                default:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) default (SENSE)\n");
-                 true = 0;
+                 done = 1;
                  break;
                }  /* switch (SenseHandler(DeviceFD, 0, pRequestSense->SenseKey.... */
              break;
 
            case SCSI_ERROR:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericRewind (TestUnitReady) SCSI_ERROR\n");
+             free(pRequestSense);
              return(-1);
-             break;
+             /*NOTREACHED*/
+
            case SCSI_BUSY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SCSI_BUSY\n");
              break;
@@ -2457,96 +2657,100 @@ int GenericRewind(int DeviceFD)
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericRewind (TestUnitReady) unknown (%d)\n",ret);
              break;
            }
-         
+
          sleep(1);
          DebugPrint(DEBUG_INFO, SECTION_TAPE," Wait .... (%d)\n",cnt);
          if (cnt > 180)
            {
              DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP GenericRewind (-1)\n");
+             free(pRequestSense);
              return(-1);
+             /*NOTREACHED*/
            }
-       } /* while true == 1 */
-      
+       } /* while !done */
+
       cnt = 0;
-      true = 1;
-      
+
       CDB[0] = SC_COM_REWIND;
-      CDB[1] = 1;             
+      CDB[1] = 1;
       CDB[2] = 0;
       CDB[3] = 0;
       CDB[4] = 0;
       CDB[5] = 0;
-      
-      while (true)
+
+      done = 0;
+      while (!done)
        {
          ret = SCSI_Run(DeviceFD, Input, CDB, 6,
-                        NULL, 0, 
-                        (char *) pRequestSense,
-                        sizeof(RequestSense_T));
-         
+                        NULL, 0,
+                        pRequestSense,
+                        SIZEOF(RequestSense_T));
+
          DecodeSense(pRequestSense, "GenericRewind : ", debug_file);
-         
-         if (ret > 0) 
+
+         if (ret > 0)
            {
              if (pRequestSense->SenseKey != UNIT_ATTENTION)
                {
-                 true = 0;
+                 done = 1;
                }
            }
          if (ret == 0)
            {
-             true = 0;
+             done = 1;
            }
          if (ret < 0)
            {
              DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericRewind : failed %d\n", ret);
-             true = 0;
+             done = 1;
            }
        }
-      
-      true = 1;
-      
-      while (true && cnt < 300)
+
+      done = 0;
+      while (!done && (cnt < 300))
        {
          ret = SCSI_TestUnitReady(DeviceFD, pRequestSense);
          DebugPrint(DEBUG_INFO, SECTION_SCSI, "GenericRewind TestUnitReady ret %d\n",ret);
          switch (ret)
            {
            case SCSI_OK:
-             true = 0;
+             done = 1;
              break;
            case SCSI_SENSE:
-             switch (SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+             switch (SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
                {
                case SENSE_NO:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_NO\n");
-                 true = 0;
+                 done = 1;
                  break;
                case SENSE_TAPE_NOT_ONLINE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_TAPE_NOT_ONLINE\n");
+                 free(pRequestSense);
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                case SENSE_IGNORE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_IGNORE\n");
-                 true = 0;
+                 done = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_ABORT\n");
+                 free(pRequestSense);
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                case SENSE_RETRY:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SENSE_RETRY\n");
                  break;
                default:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) default (SENSE)\n");
-                 true = 0;
+                 done = 1;
                  break;
                }
              break;
            case SCSI_ERROR:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"GenericRewind (TestUnitReady) SCSI_ERROR\n");
              return(-1);
-             break;     
+             /*NOTREACHED*/
+
            case SCSI_BUSY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"GenericRewind (TestUnitReady) SCSI_BUSY\n");
              break;
@@ -2561,44 +2765,28 @@ int GenericRewind(int DeviceFD)
          cnt++;
          sleep(2);
        }
-      
-      free(pRequestSense);
-      
-      DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericRewind : Ready after %d sec, true = %d\n", cnt * 2, true);
+
+      amfree(pRequestSense);
+
+      DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericRewind : Ready after %d sec, "
+                       "done = %d\n", cnt * 2, done);
       DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP GenericRewind (0)\n");
     } else {
       DebugPrint(DEBUG_INFO, SECTION_TAPE,"GenericRewind : use ioctl rewind\n");
-      if (pDev[DeviceFD].devopen == 1) 
+      if (pDev[DeviceFD].devopen == 1)
        {
          DebugPrint(DEBUG_INFO, SECTION_TAPE,"Close Device\n");
          SCSI_CloseDevice(DeviceFD);
        }
-      /*
-       * Hmm retry it if it fails ?
-       */
-      cnt = 0;
-      true = 1;
-      while (true) 
-       {
-         if ((errstr = tape_rewind(pDev[DeviceFD].dev)) == NULL)
-           {
-             true = 0;
-             DebugPrint(DEBUG_INFO, SECTION_TAPE,"Rewind OK, (after %d tries)\n", cnt);
-           } else {
-             DebugPrint(DEBUG_INFO, SECTION_TAPE,"Rewind failed %s\n",errstr);
-             /*
-              * DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP GenericRewind (-1)\n");
-              * return(-1);
-              */
-             cnt++;
-             sleep(1);
-             if (cnt > 60)
-               {
-                 DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP GenericRewind (-1), retry limit reached\n");
-                 return(-1);
-               }
-           }
-       }
+      /* We don't retry if it fails; that is left to the vtape driver. */
+      if ((errstr = tape_rewind(pDev[DeviceFD].dev)) == NULL) {
+          DebugPrint(DEBUG_INFO, SECTION_TAPE,"Rewind OK,\n", cnt);
+      } else {
+          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"Rewind failed %s\n",errstr);
+          DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP GenericRewind (-1)\n");
+          return(-1);
+         /*NOTREACHED*/
+      }
       DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP GenericRewind (0)\n");
     }
 
@@ -2611,18 +2799,23 @@ int GenericRewind(int DeviceFD)
  * bit set in the return of an request sense
  *
  */
-int GenericClean(char * Device)
+int
+GenericClean(
+    char *     Device)
 {
   extern OpenFiles_T *pDev;
   ExtendedRequestSense_T ExtRequestSense;
   int ret = 0;
 
+  (void)Device;        /* Quiet unused parameter warning */
+
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### START GenericClean\n");
   if (pDev[INDEX_TAPECTL].SCSI == 0)
       {
           DebugPrint(DEBUG_ERROR, SECTION_TAPE,"GenericClean : can't send SCSI commands\n");
          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"##### STOP GenericClean\n");
           return(0);
+         /*NOTREACHED*/
       }
 
   /*
@@ -2630,7 +2823,7 @@ int GenericClean(char * Device)
    */
   if ( RequestSense(INDEX_TAPECTL, &ExtRequestSense, 1) == 0)
     {
-      
+
       DecodeExtSense(&ExtRequestSense, "GenericClean : ", debug_file);
       if(ExtRequestSense.CLN) {
        ret = 1;
@@ -2644,20 +2837,18 @@ int GenericClean(char * Device)
   return(ret);
 }
 
-int GenericResetStatus(int DeviceFD)
+int
+GenericResetStatus(
+    int                DeviceFD)
 {
   CDB_T CDB;
   RequestSense_T *pRequestSense;
   int ret = 0;
   int retry = 1;
-  
+
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT, "##### START GenericResetStatus\n");
-  
-  if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-      {
-          DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericResetStatus : malloc failed\n");
-          return(-1);
-      }
+
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
 
   while (retry)
     {
@@ -2671,28 +2862,32 @@ int GenericResetStatus(int DeviceFD)
 
       ret = SCSI_Run(DeviceFD, Input, CDB, 6,
                                 NULL, 0,
-                                (char *) pRequestSense,
-                                sizeof(RequestSense_T));
+                                pRequestSense,
+                                SIZEOF(RequestSense_T));
 
       if (ret < 0)
         {
           /*        fprintf(stderr, "%s: Request Sense[Inquiry]: %02X", */
-          /*                "chs", ((unsigned char *) &pRequestSense)[0]); */
-          /*        for (i = 1; i < sizeof(RequestSense_T); i++)                */
-          /*          fprintf(stderr, " %02X", ((unsigned char *) &pRequestSense)[i]); */
+          /*                "chs", ((u_char *) &pRequestSense)[0]); */
+          /*        for (i = 1; i < SIZEOF(RequestSense_T); i++)                */
+          /*          fprintf(stderr, " %02X", ((u_char *) &pRequestSense)[i]); */
           /*        fprintf(stderr, "\n");    */
+         free(pRequestSense);
           return(ret);
+         /*NOTREACHED*/
         }
       if ( ret > 0 )
         {
-          switch (SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+          switch (SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
             {
             case SENSE_IGNORE:
+             free(pRequestSense);
               return(0);
-              break;
+              /*NOTREACHED*/
             case SENSE_ABORT:
+             free(pRequestSense);
               return(-1);
-              break;
+              /*NOTREACHED*/
             case SENSE_RETRY:
               retry++;
               if (retry < MAX_RETRIES )
@@ -2701,19 +2896,23 @@ int GenericResetStatus(int DeviceFD)
                   sleep(2);
                 } else {
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericResetStatus : return (-1)\n");
+                 free(pRequestSense);
                   return(-1);
+                 /*NOTREACHED*/
                 }
               break;
             default:
              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericResetStatus :  (default) return (-1)\n");
+             free(pRequestSense);
               return(-1);
-              break;
+              /*NOTREACHED*/
             }
         }
       if (ret == 0)
         retry = 0;
     }
   DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "##### STOP GenericResetStatus (%d)\n",ret);
+  free(pRequestSense);
   return(ret);
 }
 
@@ -2722,7 +2921,7 @@ int GenericResetStatus(int DeviceFD)
  * pwork is an pointer to the structure OpenFiles_T, which is filled with information
  * about the device to which we talk. Information are for example
  * The vendor, the ident, which fd, etc. This strucure is filled when we open the
- * device 
+ * device
  * flag tells how to handle the information passed in the buffer,
  * 0 -> Sense Key available
  * 1 -> No Sense key available
@@ -2731,24 +2930,30 @@ int GenericResetStatus(int DeviceFD)
  * TODO:
  * Limit recursion, may run in an infinite loop
  */
-int GenericSenseHandler(int ip, int flag, unsigned char SenseKey, unsigned char AdditionalSenseCode, unsigned char AdditionalSenseCodeQualifier, char *buffer)
-{ 
+int
+GenericSenseHandler(
+    int                        ip,
+    u_char             flag,
+    u_char             SenseKey,
+    u_char             AdditionalSenseCode,
+    u_char             AdditionalSenseCodeQualifier,
+    RequestSense_T *   pRequestSense)
+{
   extern OpenFiles_T *pDev;
-  RequestSense_T *pRequestSense = (RequestSense_T *)buffer;
-  int ret = 0;
-  unsigned char *info = NULL;
-  
+  int ret;
+  char *info = NULL;
+
   dbprintf(("##### START GenericSenseHandler\n"));
-  
+
   DecodeSense(pRequestSense, "GenericSenseHandler : ", debug_file);
-  
+
   ret = Sense2Action(pDev[ip].ident,
                     pDev[ip].inquiry->type,
                     flag, SenseKey,
                     AdditionalSenseCode,
                     AdditionalSenseCodeQualifier,
-                    (char **)&info);
-  
+                    &info);
+
   dbprintf(("##### STOP GenericSenseHandler\n"));
   return(ret);
 }
@@ -2762,48 +2967,55 @@ int GenericSenseHandler(int ip, int flag, unsigned char SenseKey, unsigned char
  * Return:
  *         == 0 -> success
  *         != 0 -> error either from the SCSI command or from
- *                 the element handling 
+ *                 the element handling
  * TODO:
 */
-int SDXMove(int DeviceFD, int from, int to)
+int
+SDXMove(
+    int                DeviceFD,
+    int                from,
+    int                to)
 {
   extern OpenFiles_T *pDev;
   ElementInfo_T *pfrom;
   ElementInfo_T *pto;
   int ret;
   int tapestat;
-  int moveok = 0;
+  int moveok;
   int SDX_MTE = 0;      /* This are parameters  passed */
   int SDX_STE = -1;     /* to                          */
   int SDX_DTE = -1;     /* AlignElements               */
 
   DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### START SDXMove\n");
-  
+
   DebugPrint(DEBUG_INFO, SECTION_MOVE,"%-20s : from = %d, to = %d\n", "SDXMove", from, to);
 
-  
+
   if ((pfrom = LookupElement(from)) == NULL)
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"SDXMove : ElementInfo for %d not found\n", from);
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
       return(-1);
+      /*NOTREACHED*/
     }
-  
+
   if ((pto = LookupElement(to)) == NULL)
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"SDXMove : ElementInfo for %d not found\n", to);
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
       return(-1);
+      /*NOTREACHED*/
     }
-  
-  if (pfrom->status == 'E') 
+
+  if (pfrom->status == 'E')
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"SDXMove : from %d is empty\n", from);
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
       return(-1);
+      /*NOTREACHED*/
     }
 
-  if (pto->status == 'F') 
+  if (pto->status == 'F')
     {
       switch (pto->status)
       {
@@ -2817,6 +3029,7 @@ int SDXMove(int DeviceFD, int from, int to)
            {
                    DebugPrint(DEBUG_ERROR, SECTION_MOVE,"SDXMove : no empty slot found for unload\n");
                    return(-1);
+                   /*NOTREACHED*/
            }
             DebugPrint(DEBUG_INFO, SECTION_MOVE,"SDXMove : Unload to %d\n", to);
             if ((pto = LookupElement(to)) == NULL)
@@ -2824,6 +3037,7 @@ int SDXMove(int DeviceFD, int from, int to)
              DebugPrint(DEBUG_INFO, SECTION_MOVE, "SDXMove : ElementInfo for %d not found\n", to);
              DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
              return(-1);
+             /*NOTREACHED*/
             }
            break;
          case IMPORT:
@@ -2869,16 +3083,18 @@ int SDXMove(int DeviceFD, int from, int to)
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
       return(-1);
+      /*NOTREACHED*/
     }
   } else {
     DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### Error setting STE/DTE %d/%d\n", SDX_STE, SDX_DTE);
     DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
     return(-1);
+    /*NOTREACHED*/
   }
 
-  /* 
-   * If from is a tape we must check if it is loaded 
-   * and if yes we have to eject it                  
+  /*
+   * If from is a tape we must check if it is loaded
+   * and if yes we have to eject it
   */
   if (pfrom->type == TAPETYPE)
   {
@@ -2886,7 +3102,7 @@ int SDXMove(int DeviceFD, int from, int to)
     if ( tapestat & TAPE_ONLINE)
     {
       if (pDev[INDEX_TAPECTL].SCSI == 1)
-      { 
+      {
         ret = eject_tape(pDev[INDEX_TAPECTL].dev,1);
       } else {
         ret = eject_tape(pDev[INDEX_TAPE].dev,2);
@@ -2894,12 +3110,13 @@ int SDXMove(int DeviceFD, int from, int to)
     }
   }
 
-  if ( ret == 0)
+  if ((ret == 0) && moveok)
   {
     ret = SCSI_Move(DeviceFD, 0, from, to);
   } else {
     DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
     return(ret);
+    /*NOTREACHED*/
   }
   DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP SDXMove\n");
   return(ret);
@@ -2912,42 +3129,49 @@ int SDXMove(int DeviceFD, int from, int to)
  * Return:
  *         == 0 -> success
  *         != 0 -> error either from the SCSI command or from
- *                 the element handling 
+ *                 the element handling
  * TODO:
 */
-int GenericMove(int DeviceFD, int from, int to)
+int
+GenericMove(
+    int                DeviceFD,
+    int                from,
+    int                to)
 {
   ElementInfo_T *pfrom;
   ElementInfo_T *pto;
   int ret = 0;
-  
+
   DebugPrint(DEBUG_INFO, SECTION_MOVE, "##### START GenericMove\n");
-  
+
   DebugPrint(DEBUG_INFO, SECTION_MOVE, "%-20s : from = %d, to = %d\n", "GenericMove", from, to);
-  
-  
+
+
   if ((pfrom = LookupElement(from)) == NULL)
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE, "GenericMove : ElementInfo for %d not found\n", from);
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP GenericMove\n");
       return(-1);
+      /*NOTREACHED*/
     }
-  
+
   if ((pto = LookupElement(to)) == NULL)
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE, "GenericMove : ElementInfo for %d not found\n", to);
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP GenericMove\n");
       return(-1);
+      /*NOTREACHED*/
     }
-  
-  if (pfrom->status == 'E') 
+
+  if (pfrom->status == 'E')
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE, "GenericMove : from %d is empty\n", from);
       DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP GenericMove\n");
       return(-1);
+      /*NOTREACHED*/
     }
-  
-  if (pto->status == 'F') 
+
+  if (pto->status == 'F')
     {
       DebugPrint(DEBUG_INFO, SECTION_MOVE, "GenericMove : Destination Element %d Type %d is full\n",
                 pto->address, pto->type);
@@ -2956,6 +3180,7 @@ int GenericMove(int DeviceFD, int from, int to)
       {
              DebugPrint(DEBUG_ERROR, SECTION_MOVE, "GenericMove : no empty slot found\n");
              return(-1);
+             /*NOTREACHED*/
       }
       DebugPrint(DEBUG_INFO, SECTION_MOVE, "GenericMove : Unload to %d\n", to);
       if ((pto = LookupElement(to)) == NULL)
@@ -2963,9 +3188,10 @@ int GenericMove(int DeviceFD, int from, int to)
           DebugPrint(DEBUG_ERROR, SECTION_MOVE, " Ups should not happen\n");
          DebugPrint(DEBUG_INFO, SECTION_MOVE,"##### STOP GenericMove\n");
          return(-1);
+         /*NOTREACHED*/
         }
     }
-  
+
   if (CheckMove(pfrom, pto))
     {
       ret = SCSI_Move(DeviceFD, 0, from, to);
@@ -2984,7 +3210,10 @@ int GenericMove(int DeviceFD, int from, int to)
  * 0 => Not OK
  */
 
-int CheckMove(ElementInfo_T *from, ElementInfo_T *to)
+int
+CheckMove(
+    ElementInfo_T *    from,
+    ElementInfo_T *    to)
 {
        int moveok = 0;
 
@@ -3148,24 +3377,30 @@ int CheckMove(ElementInfo_T *from, ElementInfo_T *to)
            */
            moveok=1;
          }
-       
+
        DebugPrint(DEBUG_INFO, SECTION_MOVE, "###### STOP CheckMove\n");
        return(moveok);
 }
 
 /*
  */
-int GetCurrentSlot(int fd, int drive)
+
+int
+GetCurrentSlot(
+    int                fd,
+    int                drive)
 {
   extern OpenFiles_T *pDev;
-  int x;
+  size_t x;
   dbprintf(("##### START GetCurrentSlot\n"));
 
+  (void)fd;    /* Quiet unused parameter warning */
+
   if (pDev[0].SCSI == 0)
       {
           dbprintf(("GetCurrentSlot : can't send SCSI commands\n"));
           return(-1);
+         /*NOTREACHED*/
       }
 
   if (ElementStatusValid == 0)
@@ -3173,8 +3408,9 @@ int GetCurrentSlot(int fd, int drive)
       if (pDev[0].functions->function_status(0, 1) != 0)
         {
           return(-1);
+         /*NOTREACHED*/
         }
-    }   
+    }
 
   /* If the from address is the as the same as the tape address skip it */
   if (pDTE[drive].from >= 0 && pDTE[drive].from != pDTE[drive].address)
@@ -3183,14 +3419,18 @@ int GetCurrentSlot(int fd, int drive)
         {
           if (pSTE[x].address == pDTE[drive].from)
             return(x);
+           /*NOTREACHED*/
         }
       return(-1);
+      /*NOTREACHED*/
     }
 
   for (x = 0; x < STE;x++)
     {
-      if (pSTE[x].status == 'E')
-        return(x);
+      if (pSTE[x].status == 'E') {
+          return(x);
+         /*NOTREACHED*/
+        }
     }
 
   /* Ups nothing loaded */
@@ -3208,19 +3448,23 @@ int GetCurrentSlot(int fd, int drive)
  * If there are error conditions try to fix them
  *
  */
-int GenericElementStatus(int DeviceFD, int InitStatus)
+int
+GenericElementStatus(
+    int                DeviceFD,
+    int                InitStatus)
 {
   int MTEError = 0;
   int STEError = 0;
   int IEEError = 0;
   int DTEError = 0;
-  int STEEmpty = 0;
 
   extern OpenFiles_T *pDev;
 
-  int error = 0;   /* If set do an INIT ELEMENT STATUS */
-  int x;           /* The standard loop counter :-) */
-  int loop = 2;    /* Redo it if an error has been reset */
+  int error = 0;    /* If set do an INIT ELEMENT STATUS */
+  size_t x;         /* The standard loop counter :-) */
+  int retry = 2;    /* Redo it if an error has been reset */
+
+  (void)InitStatus;    /* Quiet unused parameter warning */
 
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT, "##### START GenericElementStatus\n");
 
@@ -3233,11 +3477,8 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
        */
       if (pModePage == NULL && LibModeSenseValid == 0)
         {
-          if ((pModePage = malloc(0xff)) == NULL)
-            {
-              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-              return(-1);
-            }
+          pModePage = alloc(0xff);
+
          if (SCSI_ModeSense(DeviceFD, pModePage, 0xff, 0x8, 0x3f) == 0)
            {
              LibModeSenseValid = 1;
@@ -3248,15 +3489,14 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
            }
         }
     }
-  
-  if (GetElementStatus(DeviceFD) == 0 && loop > 0)
+
+  while ((GetElementStatus(DeviceFD) == 0) && (retry-- > 0))
     {
-      loop--;
       for (x = 0; x < MTE; x++)
        {
          if (pMTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pMTE[x].ASC, pMTE[x].ASCQ, (char *)&pMTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pMTE[x].ASC, pMTE[x].ASCQ, (RequestSense_T *)&pMTE[x]))
                {
                case SENSE_IES:
                  MTEError = 1;
@@ -3265,7 +3505,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericElementStatus : Abort on MTE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3274,7 +3514,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
        {
          if (pIEE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pIEE[x].ASC, pIEE[x].ASCQ, (char *)&pIEE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pIEE[x].ASC, pIEE[x].ASCQ, (RequestSense_T *)&pIEE[x]))
                {
                case SENSE_IES:
                  IEEError = 1;
@@ -3283,7 +3523,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericElementStatus : Abort on IEE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3291,18 +3531,9 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
 
       for (x = 0; x < STE; x++)
        {
-         /*
-          * Needed for the hack to guess the tape status if an error
-          * for the tape is pending
-          */
-         if (pSTE[x].status == 'E')
-           {
-             STEEmpty = 1;
-           }
-
          if (pSTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pSTE[x].ASC, pSTE[x].ASCQ, (char *)&pSTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pSTE[x].ASC, pSTE[x].ASCQ, (RequestSense_T *)&pSTE[x]))
                {
                case SENSE_IES:
                  STEError = 1;
@@ -3311,7 +3542,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericElementStatus : Abort on IES\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3320,7 +3551,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
        {
          if (pDTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pDTE[x].ASC, pDTE[x].ASCQ, (char *)&pDTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pDTE[x].ASC, pDTE[x].ASCQ, (RequestSense_T *)&pDTE[x]))
                {
                case SENSE_IES:
                  DTEError = 1;
@@ -3329,7 +3560,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericElementStatus : Abort on DTE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3346,6 +3577,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
              ElementStatusValid = 0;
              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericElementStatus : Can't init status STEError(%d) MTEError(%d) DTEError(%d) IEEError(%d)\n", STEError, MTEError, DTEError, IEEError);
              return(-1);
+             /*NOTREACHED*/
            }
          error = 0;
        }
@@ -3370,6 +3602,7 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
     {
       DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "GenericElementStatus : Can't init status (after loop)\n");
       return(-1);
+      /*NOTREACHED*/
     }
 
   ElementStatusValid = 1;
@@ -3382,20 +3615,21 @@ int GenericElementStatus(int DeviceFD, int InitStatus)
  * This is for the ADIC changer, it seems that they have an diferent
  * offset in the mode sense data before the first mode page (+12)
  */
-int DLT448ElementStatus(int DeviceFD, int InitStatus)
+int
+DLT448ElementStatus(
+    int                DeviceFD,
+    int                InitStatus)
 {
-  int MTEError = 0;
-  int STEError = 0;
-  int IEEError = 0;
   int DTEError = 0;
-  int STEEmpty = 0;
 
   extern OpenFiles_T *pDev;
 
   int error = 0;   /* If set do an INIT ELEMENT STATUS */
-  int x;           /* The standard loop counter :-) */
+  size_t x;        /* The standard loop counter :-) */
   int loop = 2;    /* Redo it if an error has been reset */
 
+  (void)InitStatus;    /* Quiet unused parameter warning */
+
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT, "##### START DLT448ElementStatus\n");
 
   if (pEAAPage == NULL)
@@ -3407,11 +3641,8 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
        */
       if (pModePage == NULL && LibModeSenseValid == 0)
         {
-          if ((pModePage = malloc(0xff)) == NULL)
-            {
-              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"DLT448ElementStatus : malloc failed\n");
-              return(-1);
-            }
+          pModePage = alloc(0xff);
+
          if (SCSI_ModeSense(DeviceFD, pModePage, 0xff, 0x8, 0x3f) == 0)
            {
              LibModeSenseValid = 1;
@@ -3422,24 +3653,22 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
            }
         }
     }
-  
-  if (GetElementStatus(DeviceFD) == 0 && loop > 0)
+
+  while (GetElementStatus(DeviceFD) == 0 && loop-- > 0)
     {
-      loop--;
       for (x = 0; x < MTE; x++)
        {
          if (pMTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pMTE[x].ASC, pMTE[x].ASCQ, (char *)&pMTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pMTE[x].ASC, pMTE[x].ASCQ, (RequestSense_T *)&pMTE[x]))
                {
                case SENSE_IES:
-                 MTEError = 1;
                  error = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "DLT448ElementStatus : Abort on MTE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3448,16 +3677,15 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
        {
          if (pIEE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pIEE[x].ASC, pIEE[x].ASCQ, (char *)&pIEE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pIEE[x].ASC, pIEE[x].ASCQ, (RequestSense_T *)&pIEE[x]))
                {
                case SENSE_IES:
-                 IEEError = 1;
                  error = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "DLT448ElementStatus : Abort on IEE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3469,23 +3697,17 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
           * Needed for the hack to guess the tape status if an error
           * for the tape is pending
           */
-         if (pSTE[x].status == 'E')
-           {
-             STEEmpty = 1;
-           }
-
          if (pSTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pSTE[x].ASC, pSTE[x].ASCQ, (char *)&pSTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pSTE[x].ASC, pSTE[x].ASCQ, (RequestSense_T *)&pSTE[x]))
                {
                case SENSE_IES:
-                 STEError = 1;
                  error = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "DLT448ElementStatus : Abort on IES\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3494,7 +3716,7 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
        {
          if (pDTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pDTE[x].ASC, pDTE[x].ASCQ, (char *)&pDTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pDTE[x].ASC, pDTE[x].ASCQ, (RequestSense_T *)&pDTE[x]))
                {
                case SENSE_IES:
                  DTEError = 1;
@@ -3503,7 +3725,7 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "DLT448ElementStatus : Abort on DTE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3520,6 +3742,7 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
              ElementStatusValid = 0;
              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "DLT448ElementStatus : Can't init status\n");
              return(-1);
+             /*NOTREACHED*/
            }
          error = 0;
        }
@@ -3544,6 +3767,7 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
     {
       DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "DLT448ElementStatus : Can't init status (after loop)\n");
       return(-1);
+      /*NOTREACHED*/
     }
 
   ElementStatusValid = 1;
@@ -3552,22 +3776,22 @@ int DLT448ElementStatus(int DeviceFD, int InitStatus)
 }
 
 
-/* 
+/*
  * Much the same like GenericElementStatus but
  * it seemes that for the STE Elements ASC/ASCQ is not set
  * on an error, only the except bit is set
 */
-int SDXElementStatus(int DeviceFD, int InitStatus)
+int
+SDXElementStatus(
+    int                DeviceFD,
+    int                InitStatus)
 {
-  int MTEError = 0;
-  int STEError = 0;
-  int IEEError = 0;
-  int DTEError = 0;
-
   int error = 0;   /* If set do an INIT ELEMENT STATUS */
-  int x;           /* The standard loop counter :-) */
+  size_t x;        /* The standard loop counter :-) */
   int loop = 2;    /* Redo it if an error has been reset */
 
+  (void)InitStatus;    /* Quiet unused parameter warning */
+
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT, "##### START SDXElementStatus\n");
 
   if (pEAAPage == NULL)
@@ -3579,11 +3803,8 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
        */
       if (pModePage == NULL && LibModeSenseValid == 0)
         {
-          if ((pModePage = malloc(0xff)) == NULL)
-            {
-              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"SDXElementStatus : malloc failed\n");
-              return(-1);
-            }
+          pModePage = alloc(0xff);
+
          if (SCSI_ModeSense(DeviceFD, pModePage, 0xff, 0x8, 0x3f) == 0)
            {
              LibModeSenseValid = 1;
@@ -3595,24 +3816,22 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
         }
     }
 
-  if (GetElementStatus(DeviceFD) == 0 && loop)
+  while (GetElementStatus(DeviceFD) == 0 && loop--)
     {
-      loop--;
       error = 0;
       for (x = 0; x < MTE; x++)
        {
          if (pMTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pMTE[x].ASC, pMTE[x].ASCQ, (char *)&pMTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pMTE[x].ASC, pMTE[x].ASCQ, (RequestSense_T *)&pMTE[x]))
                {
                case SENSE_IES:
-                 MTEError = 1;
                  error = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "SDXElementStatus : Abort on MTE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3621,16 +3840,15 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
        {
          if (pIEE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pIEE[x].ASC, pIEE[x].ASCQ, (char *)&pIEE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pIEE[x].ASC, pIEE[x].ASCQ, (RequestSense_T *)&pIEE[x]))
                {
                case SENSE_IES:
-                 IEEError = 1;
                  error = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "SDXElementStatus : Abort on IEE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3638,23 +3856,17 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
 
       for (x = 0; x < STE; x++)
        {
-         if (pSTE[x].except != 0)
-           {
-             STEError = 1;
-           }
-
          if (pSTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pSTE[x].ASC, pSTE[x].ASCQ, (char *)&pSTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pSTE[x].ASC, pSTE[x].ASCQ, (RequestSense_T *)&pSTE[x]))
                {
                case SENSE_IES:
-                 STEError = 1;
                  error = 1;
                  break;
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "SDXElementStatus : Abort on IES\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3663,10 +3875,9 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
        {
          if (pDTE[x].ASC > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pDTE[x].ASC, pDTE[x].ASCQ, (char *)&pDTE[x]))
+             switch(SenseHandler(DeviceFD, 0, SENSE_CHG_ELEMENT_STATUS, pDTE[x].ASC, pDTE[x].ASCQ, (RequestSense_T *)&pDTE[x]))
                {
                case SENSE_IES:
-                 DTEError = 1;
                  /*
                  error = 1;
                  */
@@ -3674,7 +3885,7 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
                case SENSE_ABORT:
                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "SDXElementStatus : Abort on DTE\n");
                  return(-1);
-                 break;
+                 /*NOTREACHED*/
                }
            }
        }
@@ -3691,6 +3902,7 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
              ElementStatusValid = 0;
              DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "SDXElementStatus : Can't init status\n");
              return(-1);
+             /*NOTREACHED*/
            }
        }
 
@@ -3701,6 +3913,7 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
     {
       DebugPrint(DEBUG_ERROR, SECTION_ELEMENT, "SDXElementStatus : Can't init status\n");
       return(-1);
+      /*NOTREACHED*/
     }
 
   ElementStatusValid = 1;
@@ -3719,33 +3932,34 @@ int SDXElementStatus(int DeviceFD, int InitStatus)
  * Only do the read, error handling is done by the calling function
  *
  * Return Values:
- * < 0   -> Error 
+ * < 0   -> Error
  * == 0  -> OK
  *
  * TODO:
  */
-int GetElementStatus(int DeviceFD)
+int
+GetElementStatus(
+    int DeviceFD)
 {
-  unsigned char *DataBuffer = NULL;
-  int DataBufferLength;
+  u_char *DataBuffer = NULL;
+  size_t DataBufferLength;
   ElementStatusData_T *ElementStatusData;
   ElementStatusPage_T *ElementStatusPage;
   MediumTransportElementDescriptor_T *MediumTransportElementDescriptor;
   StorageElementDescriptor_T *StorageElementDescriptor;
   DataTransferElementDescriptor_T *DataTransferElementDescriptor;
   ImportExportElementDescriptor_T *ImportExportElementDescriptor;
-  int x = 0;
-  int offset = 0;
-  int length = 0;      /* Length of an Element */
-  int barcode = 0;      /* To store the result of the BarCode function */
-  int NoOfElements;
+  size_t x;
+  size_t offset;
+  size_t length;       /* Length of an Element */
+  size_t NoOfElements;
+
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"##### START GetElementStatus\n");
-  
+
   barcode = BarCode(DeviceFD);
 
-  /* 
-   * If the MODE_SENSE was successfull we use this Information to read the Elelement Info 
+  /*
+   * If the MODE_SENSE was successfull we use this Information to read the Elelement Info
    */
   if (pEAAPage != NULL)
     {
@@ -3754,71 +3968,68 @@ int GetElementStatus(int DeviceFD)
       if (V2(pEAAPage->NoMediumTransportElements)  > 0)
         {
           MTE = V2(pEAAPage->NoMediumTransportElements) ;
-          if (pMTE == NULL)
-            {
-              if ((pMTE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * MTE)) == NULL)
-                {
-                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-            }
-          memset(pMTE, 0, sizeof(ElementInfo_T) * MTE);
-         
-          if (SCSI_ReadElementStatus(DeviceFD, 
-                                     CHANGER, 
+          pMTE = alloc(SIZEOF(ElementInfo_T) * MTE);
+          memset(pMTE, 0, SIZEOF(ElementInfo_T) * MTE);
+
+          if (SCSI_ReadElementStatus(DeviceFD,
+                                     CHANGER,
                                      0,
-                                     barcode,
+                                     (u_char)barcode,
                                      V2(pEAAPage->MediumTransportElementAddress),
-                                     MTE+1,
-                                    sizeof(MediumTransportElementDescriptor_T),
-                                     (char **)&DataBuffer) != 0)
+                                     (MTE + (size_t)1),
+                                    SIZEOF(MediumTransportElementDescriptor_T),
+                                     &DataBuffer) != 0)
             {
-              if (DataBuffer != 0)
-               {
-                 free(DataBuffer);
-               }
               ChgExit("genericElementStatus","Can't read MTE status", FATAL);
+             /*NOTREACHED*/
             }
-          ElementStatusData = (ElementStatusData_T *)DataBuffer;
-          offset = sizeof(ElementStatusData_T);
-          
+          // ElementStatusData = (ElementStatusData_T *)DataBuffer;
+          offset = SIZEOF(ElementStatusData_T);
+
           ElementStatusPage = (ElementStatusPage_T *)&DataBuffer[offset];
-          offset = offset + sizeof(ElementStatusPage_T);
+          offset = offset + SIZEOF(ElementStatusPage_T);
          length = V2(ElementStatusPage->length);
-          DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"MTE Length %d(%d)\n",length,sizeof(MediumTransportElementDescriptor_T));
-          
+
+          DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"MTE Length %d(%d)\n", length,
+                       SIZEOF(MediumTransportElementDescriptor_T));
+
           for (x = 0; x < MTE; x++)
             {
               MediumTransportElementDescriptor = (MediumTransportElementDescriptor_T *)&DataBuffer[offset];
-             
+
               if (ElementStatusPage->pvoltag == 1)
                 {
-                  strncpy(pMTE[x].VolTag, 
-                          MediumTransportElementDescriptor->pvoltag,
+                  strncpy((char *)pMTE[x].VolTag,
+                          (char *)MediumTransportElementDescriptor->pvoltag,
                           TAG_SIZE);
                   TerminateString(pMTE[x].VolTag, TAG_SIZE+1);
                 }
-             
+
               pMTE[x].type = ElementStatusPage->type;
               pMTE[x].address = V2(MediumTransportElementDescriptor->address);
               pMTE[x].except = MediumTransportElementDescriptor->except;
-              pMTE[x].status = (MediumTransportElementDescriptor->full > 0) ? 'F':'E';
               pMTE[x].full = MediumTransportElementDescriptor->full;
-             
+             if (MediumTransportElementDescriptor->full > 0)
+               {
+                  pMTE[x].status = 'F';
+               } else {
+                  pMTE[x].status = 'E';
+               }
+
              if (length >= 5)
                {
                  pMTE[x].ASC = MediumTransportElementDescriptor->asc;
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC MTE\n");
                }
-             
+
              if (length >= 6)
                {
                  pMTE[x].ASCQ = MediumTransportElementDescriptor->ascq;
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ MTE\n");
                }
-             
+
              if (length >= 0xa)
                {
                  if (MediumTransportElementDescriptor->svalid == 1)
@@ -3830,81 +4041,80 @@ int GetElementStatus(int DeviceFD)
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source MTE\n");
                }
-             offset = offset + length; 
+             offset = offset + length;
             }
+           free(DataBuffer);
+           DataBuffer = NULL;
         }
-      /* 
-       * Storage Elements 
+      /*
+       * Storage Elements
        */
       if ( V2(pEAAPage->NoStorageElements)  > 0)
         {
+          free(pSTE);
           STE = V2(pEAAPage->NoStorageElements);
-          if (pSTE == NULL)
-            {
-              if ((pSTE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * STE)) == NULL)
-                {
-                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-            }
-          memset(pSTE, 0, sizeof(ElementInfo_T) * STE);
-          
-          if (SCSI_ReadElementStatus(DeviceFD, 
-                                     STORAGE, 
+          pSTE = alloc(SIZEOF(ElementInfo_T) * STE);
+          memset(pSTE, 0, SIZEOF(ElementInfo_T) * STE);
+
+          if (SCSI_ReadElementStatus(DeviceFD,
+                                     STORAGE,
                                      0,
-                                     barcode,
+                                     (u_char)barcode,
                                      V2(pEAAPage->FirstStorageElementAddress),
                                      STE,
-                                    sizeof(StorageElementDescriptor_T),
-                                     (char **)&DataBuffer) != 0)
+                                    SIZEOF(StorageElementDescriptor_T),
+                                     &DataBuffer) != 0)
             {
-              if (DataBuffer != 0)
-               {
-                 free(DataBuffer);
-               }
               ChgExit("GetElementStatus", "Can't read STE status", FATAL);
+             /*NOTREACHED*/
             }
-          
-          ElementStatusData = (ElementStatusData_T *)DataBuffer;
-          offset = sizeof(ElementStatusData_T);
-          
+         assert(DataBuffer != NULL);
+
+          // ElementStatusData = (ElementStatusData_T *)DataBuffer;
+          offset = SIZEOF(ElementStatusData_T);
+
           ElementStatusPage = (ElementStatusPage_T *)&DataBuffer[offset];
-          offset = offset + sizeof(ElementStatusPage_T);
+          offset = offset + SIZEOF(ElementStatusPage_T);
          length = V2(ElementStatusPage->length);
           DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"STE Length %d\n",length);
-          
+
           for (x = 0; x < STE; x++)
             {
               StorageElementDescriptor = (StorageElementDescriptor_T *)&DataBuffer[offset];
               if (ElementStatusPage->pvoltag == 1)
                 {
-                  strncpy(pSTE[x].VolTag, 
-                          StorageElementDescriptor->pvoltag,
+                  strncpy(pSTE[x].VolTag,
+                          (char *)StorageElementDescriptor->pvoltag,
                           TAG_SIZE);
                   TerminateString(pSTE[x].VolTag, TAG_SIZE+1);
                 }
-              
-              
+
+
               pSTE[x].type = ElementStatusPage->type;
               pSTE[x].address = V2(StorageElementDescriptor->address);
               pSTE[x].except = StorageElementDescriptor->except;
-              pSTE[x].status = (StorageElementDescriptor->full > 0) ? 'F':'E';
               pSTE[x].full = StorageElementDescriptor->full;
-             
+              if (StorageElementDescriptor->full > 0)
+               {
+                 pSTE[x].status = 'F';
+               } else {
+                 pSTE[x].status = 'E';
+               }
+
              if (length >= 5)
                {
                  pSTE[x].ASC = StorageElementDescriptor->asc;
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC STE\n");
                }
-             
+
              if (length >= 6)
                {
                  pSTE[x].ASCQ = StorageElementDescriptor->ascq;
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ STE\n");
                }
-              
+
              if (length >= 0xa)
                {
                  if (StorageElementDescriptor->svalid == 1)
@@ -3912,84 +4122,83 @@ int GetElementStatus(int DeviceFD)
                      pSTE[x].from = V2(StorageElementDescriptor->source);
                    } else {
                      pSTE[x].from = -1;
-                   }              
+                   }
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source STE\n");
                }
-             
-              offset = offset + length; 
+
+              offset = offset + length;
             }
-          
+           free(DataBuffer);
+           DataBuffer = NULL;
         }
-      /* 
+      /*
        * Import/Export Elements
        */
       if ( V2(pEAAPage->NoImportExportElements) > 0)
         {
+          free(pIEE);
           IEE = V2(pEAAPage->NoImportExportElements);
-          if (pIEE == NULL)
-            {
-              if ((pIEE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * IEE)) == NULL)
-                {
-                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-            }
-          memset(pIEE, 0, sizeof(ElementInfo_T) * IEE);
-          if (SCSI_ReadElementStatus(DeviceFD, 
-                                     IMPORT, 
+          pIEE = alloc(SIZEOF(ElementInfo_T) * IEE);
+          memset(pIEE, 0, SIZEOF(ElementInfo_T) * IEE);
+
+          if (SCSI_ReadElementStatus(DeviceFD,
+                                     IMPORT,
                                      0,
-                                     barcode,
+                                     (u_char)barcode,
                                      V2(pEAAPage->FirstImportExportElementAddress),
                                      IEE,
-                                    sizeof(ImportExportElementDescriptor_T),
-                                     (char **)&DataBuffer) != 0)
+                                    SIZEOF(ImportExportElementDescriptor_T),
+                                     &DataBuffer) != 0)
             {
-              if (DataBuffer != 0)
-               {
-                 free(DataBuffer);
-               }
               ChgExit("GetElementStatus", "Can't read IEE status", FATAL);
+             /*NOTREACHED*/
             }
-          
-          ElementStatusData = (ElementStatusData_T *)DataBuffer;
-          offset = sizeof(ElementStatusData_T);
-          
+         assert(DataBuffer != NULL);
+
+          // ElementStatusData = (ElementStatusData_T *)DataBuffer;
+          offset = SIZEOF(ElementStatusData_T);
+
           ElementStatusPage = (ElementStatusPage_T *)&DataBuffer[offset];
-          offset = offset + sizeof(ElementStatusPage_T);
+          offset = offset + SIZEOF(ElementStatusPage_T);
          length = V2(ElementStatusPage->length);
           DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"IEE Length %d\n",length);
-          
+
           for (x = 0; x < IEE; x++)
             {
               ImportExportElementDescriptor = (ImportExportElementDescriptor_T *)&DataBuffer[offset];
               if (ElementStatusPage->pvoltag == 1)
                 {
-                  strncpy(pIEE[x].VolTag, 
-                          ImportExportElementDescriptor->pvoltag,
+                  strncpy(pIEE[x].VolTag,
+                          (char *)ImportExportElementDescriptor->pvoltag,
                           TAG_SIZE);
                   TerminateString(pIEE[x].VolTag, TAG_SIZE+1);
                 }
               pIEE[x].type = ElementStatusPage->type;
               pIEE[x].address = V2(ImportExportElementDescriptor->address);
               pIEE[x].except = ImportExportElementDescriptor->except;
-              pIEE[x].status = (ImportExportElementDescriptor->full > 0) ? 'F':'E';
               pIEE[x].full = ImportExportElementDescriptor->full;
-             
+             if (ImportExportElementDescriptor->full > 0)
+               {
+                 pIEE[x].status = 'F';
+               } else {
+                 pIEE[x].status = 'E';
+               }
+
              if (length >= 5)
                {
                  pIEE[x].ASC = ImportExportElementDescriptor->asc;
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC IEE\n");
                }
-             
+
              if (length >= 6)
                {
                  pIEE[x].ASCQ = ImportExportElementDescriptor->ascq;
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ IEE\n");
                }
-              
+
              if (length >= 0xa)
                {
                  if (ImportExportElementDescriptor->svalid == 1)
@@ -3997,61 +4206,55 @@ int GetElementStatus(int DeviceFD)
                      pIEE[x].from = V2(ImportExportElementDescriptor->source);
                    } else {
                      pIEE[x].from = -1;
-                   }              
+                   }
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source IEE\n");
                }
-             
-              offset = offset + length; 
+
+              offset = offset + length;
             }
-          
+           free(DataBuffer);
+           DataBuffer = NULL;
         }
-      /* 
+      /*
        * Data Transfer Elements
        */
       if (V2(pEAAPage->NoDataTransferElements) >0)
         {
+         free(pDTE);
           DTE = V2(pEAAPage->NoDataTransferElements) ;
-          if (pDTE == NULL)
-            {
-              if ((pDTE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * DTE)) == NULL)
-                {
-                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-            }
-          memset(pDTE, 0, sizeof(ElementInfo_T) * DTE);
-          if (SCSI_ReadElementStatus(DeviceFD, 
-                                     TAPETYPE, 
+          pDTE = alloc(SIZEOF(ElementInfo_T) * DTE);
+          memset(pDTE, 0, SIZEOF(ElementInfo_T) * DTE);
+
+          if (SCSI_ReadElementStatus(DeviceFD,
+                                     TAPETYPE,
                                      0,
-                                     barcode,
+                                     (u_char)barcode,
                                      V2(pEAAPage->FirstDataTransferElementAddress),
                                      DTE,
-                                    sizeof(DataTransferElementDescriptor_T),
-                                     (char **)&DataBuffer) != 0)
+                                    SIZEOF(DataTransferElementDescriptor_T),
+                                     &DataBuffer) != 0)
             {
-              if (DataBuffer != 0)
-               {
-                 free(DataBuffer);
-               }
               ChgExit("GenericElementStatus", "Can't read DTE status", FATAL);
+             /*NOTREACHED*/
             }
-          
-          ElementStatusData = (ElementStatusData_T *)DataBuffer;
-          offset = sizeof(ElementStatusData_T);
-          
+         assert(DataBuffer != NULL);
+
+          // ElementStatusData = (ElementStatusData_T *)DataBuffer;
+          offset = SIZEOF(ElementStatusData_T);
+
           ElementStatusPage = (ElementStatusPage_T *)&DataBuffer[offset];
-          offset = offset + sizeof(ElementStatusPage_T);
+          offset = offset + SIZEOF(ElementStatusPage_T);
          length = V2(ElementStatusPage->length);
           DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"DTE Length %d\n",length);
-         
+
           for (x = 0; x < DTE; x++)
             {
               DataTransferElementDescriptor = (DataTransferElementDescriptor_T *)&DataBuffer[offset];
               if (ElementStatusPage->pvoltag == 1)
                 {
-                  strncpy(pDTE[x].VolTag, 
-                          DataTransferElementDescriptor->pvoltag,
+                  strncpy(pDTE[x].VolTag,
+                          (char *)DataTransferElementDescriptor->pvoltag,
                           TAG_SIZE);
                   TerminateString(pDTE[x].VolTag, TAG_SIZE+1);
                 }
@@ -4059,23 +4262,28 @@ int GetElementStatus(int DeviceFD)
              pDTE[x].address = V2(DataTransferElementDescriptor->address);
               pDTE[x].except = DataTransferElementDescriptor->except;
               pDTE[x].scsi = DataTransferElementDescriptor->scsi;
-              pDTE[x].status = (DataTransferElementDescriptor->full > 0) ? 'F':'E';
               pDTE[x].full = DataTransferElementDescriptor->full;
-              
+              if (DataTransferElementDescriptor->full > 0)
+               {
+                 pDTE[x].status = 'F';
+               } else {
+                 pDTE[x].status = 'E';
+               }
+
              if (length >= 5)
              {
                pDTE[x].ASC = DataTransferElementDescriptor->asc;
              } else {
                DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC DTE\n");
              }
-             
+
              if (length >= 6)
                {
                  pDTE[x].ASCQ = DataTransferElementDescriptor->ascq;
              } else {
                DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ DTE\n");
              }
-             
+
              if (length >= 0xa)
                {
                  if (DataTransferElementDescriptor->svalid == 1)
@@ -4087,90 +4295,86 @@ int GetElementStatus(int DeviceFD)
                } else {
                  DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source STE\n");
                }
-             
-              offset = offset + length; 
+
+              offset = offset + length;
             }
+           free(DataBuffer);
+           DataBuffer = NULL;
         }
     } else {
       /*
        * And now the old way, when we get here the read mode sense page has failed ...
        */
       DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Reading Element Status the old way .... (max 255 elements)\n");
-      if (SCSI_ReadElementStatus(DeviceFD, 
-                                 0, 
+      if (SCSI_ReadElementStatus(DeviceFD,
+                                 0,
                                  0,
-                                 barcode,
+                                 (u_char)barcode,
                                  0,
-                                 0xff,
-                                0x7f,
-                                 (char **)&DataBuffer) != 0)
+                                 (size_t)0xff,
+                                (size_t)0x7f,
+                                 &DataBuffer) != 0)
         {
-         if (DataBuffer != 0)
-           {
-             free(DataBuffer);
-           }
           ChgExit("GenericElementStatus","Can't get ElementStatus", FATAL);
+         /*NOTREACHED*/
         }
-      
+      assert(DataBuffer != NULL);
+
       ElementStatusData = (ElementStatusData_T *)DataBuffer;
       DataBufferLength = V3(ElementStatusData->count);
-      
-      offset = sizeof(ElementStatusData_T);
-      
-      if (DataBufferLength <= 0) 
-        {
-          DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"DataBufferLength %d\n",DataBufferLength);
-          return(1);
-        }
-      
-      while (offset < DataBufferLength) 
+
+      offset = SIZEOF(ElementStatusData_T);
+
+      while (offset < DataBufferLength)
         {
           ElementStatusPage = (ElementStatusPage_T *)&DataBuffer[offset];
           NoOfElements = V3(ElementStatusPage->count) / V2(ElementStatusPage->length);
-          offset = offset + sizeof(ElementStatusPage_T);
+          offset = offset + SIZEOF(ElementStatusPage_T);
          length = V2(ElementStatusPage->length);
-          
+
           switch (ElementStatusPage->type)
             {
             case CHANGER:
+             free(pMTE);
               MTE = NoOfElements;
-              if ((pMTE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * MTE)) == NULL)
-                {
-                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-              memset(pMTE, 0, sizeof(ElementInfo_T) * MTE);
+              pMTE = alloc(SIZEOF(ElementInfo_T) * MTE);
+              memset(pMTE, 0, SIZEOF(ElementInfo_T) * MTE);
+
               for (x = 0; x < NoOfElements; x++)
-                {                  
+                {
                   MediumTransportElementDescriptor = (MediumTransportElementDescriptor_T *)&DataBuffer[offset];
                   if (ElementStatusPage->pvoltag == 1)
                     {
-                      strncpy(pMTE[x].VolTag, 
-                              MediumTransportElementDescriptor->pvoltag,
+                      strncpy(pMTE[x].VolTag,
+                              (char *)MediumTransportElementDescriptor->pvoltag,
                               TAG_SIZE);
                       TerminateString(pMTE[x].VolTag, TAG_SIZE+1);
                     }
                   pMTE[x].type = ElementStatusPage->type;
                   pMTE[x].address = V2(MediumTransportElementDescriptor->address);
                   pMTE[x].except = MediumTransportElementDescriptor->except;
-                  pMTE[x].status = (MediumTransportElementDescriptor->full > 0) ? 'F':'E';
                   pMTE[x].full = MediumTransportElementDescriptor->full;
-                  
-                 
+                 if (MediumTransportElementDescriptor->full > 0)
+                   {
+                     pMTE[x].status = 'F';
+                   } else {
+                     pMTE[x].status = 'E';
+                   }
+
                  if (length >= 5)
                    {
                      pMTE[x].ASC = MediumTransportElementDescriptor->asc;
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC MTE\n");
                    }
-                 
+
                  if (length >= 6)
                    {
                      pMTE[x].ASCQ = MediumTransportElementDescriptor->ascq;
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ MTE\n");
                    }
-                 
+
                  if (length >= 0xa)
                    {
                      if (MediumTransportElementDescriptor->svalid == 1)
@@ -4178,38 +4382,41 @@ int GetElementStatus(int DeviceFD)
                          pMTE[x].from = V2(MediumTransportElementDescriptor->source);
                        } else {
                          pMTE[x].from = -1;
-                       }                  
+                       }
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source MTE\n");
                    }
 
-                 offset = offset + length; 
+                 offset = offset + length;
                }
               break;
             case STORAGE:
+             free(pSTE);
               STE = NoOfElements;
-              if ((pSTE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * STE)) == NULL)
-                {
-                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-              memset(pSTE, 0, sizeof(ElementInfo_T) * STE);
+              pSTE = alloc(SIZEOF(ElementInfo_T) * STE);
+              memset(pSTE, 0, SIZEOF(ElementInfo_T) * STE);
+
               for (x = 0; x < NoOfElements; x++)
                 {
                  StorageElementDescriptor = (StorageElementDescriptor_T *)&DataBuffer[offset];
                   if (ElementStatusPage->pvoltag == 1)
                     {
-                      strncpy(pSTE[x].VolTag, 
-                              StorageElementDescriptor->pvoltag,
+                      strncpy(pSTE[x].VolTag,
+                              (char *)StorageElementDescriptor->pvoltag,
                               TAG_SIZE);
                       TerminateString(pSTE[x].VolTag, TAG_SIZE+1);
                     }
-                  
+
                   pSTE[x].type = ElementStatusPage->type;
                   pSTE[x].address = V2(StorageElementDescriptor->address);
                   pSTE[x].except = StorageElementDescriptor->except;
-                  pSTE[x].status = (StorageElementDescriptor->full > 0) ? 'F':'E';
                   pSTE[x].full = StorageElementDescriptor->full;
+                 if (StorageElementDescriptor->full > 0)
+                   {
+                     pSTE[x].status = 'F';
+                   } else {
+                     pSTE[x].status = 'E';
+                   }
 
                  if (length >= 5)
                    {
@@ -4217,14 +4424,14 @@ int GetElementStatus(int DeviceFD)
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC STE\n");
                    }
-                 
+
                  if (length >= 6)
                    {
                      pSTE[x].ASCQ = StorageElementDescriptor->ascq;
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ STE\n");
                    }
-                 
+
                  if (length >= 0xa)
                    {
                      if (StorageElementDescriptor->svalid == 1)
@@ -4232,30 +4439,27 @@ int GetElementStatus(int DeviceFD)
                          pSTE[x].from = V2(StorageElementDescriptor->source);
                        } else {
                          pSTE[x].from = -1;
-                       }              
+                       }
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source STE\n");
                    }
-                 
-                  offset = offset + length; 
+
+                  offset = offset + length;
                 }
               break;
             case IMPORT:
+             free(pIEE);
               IEE = NoOfElements;
-              if ((pIEE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * IEE)) == NULL)
-                {
-                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-              memset(pIEE, 0, sizeof(ElementInfo_T) * IEE);
-              
+              pIEE = alloc(SIZEOF(ElementInfo_T) * IEE);
+              memset(pIEE, 0, SIZEOF(ElementInfo_T) * IEE);
+
               for (x = 0; x < NoOfElements; x++)
                 {
                   ImportExportElementDescriptor = (ImportExportElementDescriptor_T *)&DataBuffer[offset];
                   if (ElementStatusPage->pvoltag == 1)
                     {
-                      strncpy(pIEE[x].VolTag, 
-                              ImportExportElementDescriptor->pvoltag,
+                      strncpy(pIEE[x].VolTag,
+                              (char *)ImportExportElementDescriptor->pvoltag,
                               TAG_SIZE);
                       TerminateString(pIEE[x].VolTag, TAG_SIZE+1);
                     }
@@ -4263,23 +4467,28 @@ int GetElementStatus(int DeviceFD)
                   pIEE[x].type = ElementStatusPage->type;
                   pIEE[x].address = V2(ImportExportElementDescriptor->address);
                   pIEE[x].except = ImportExportElementDescriptor->except;
-                  pIEE[x].status = (ImportExportElementDescriptor->full > 0) ? 'F':'E';
                   pIEE[x].full = ImportExportElementDescriptor->full;
-                 
+                 if (ImportExportElementDescriptor->full > 0)
+                   {
+                     pIEE[x].status = 'F';
+                   } else {
+                     pIEE[x].status = 'E';
+                   }
+
                  if (length >= 5)
                    {
                      pIEE[x].ASC = ImportExportElementDescriptor->asc;
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC IEE\n");
                    }
-                 
+
                  if (length >= 6)
                    {
                      pIEE[x].ASCQ = ImportExportElementDescriptor->ascq;
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ IEE\n");
                    }
-                 
+
                  if (length >= 0xa)
                    {
                      if (ImportExportElementDescriptor->svalid == 1)
@@ -4287,30 +4496,27 @@ int GetElementStatus(int DeviceFD)
                          pIEE[x].from = V2(ImportExportElementDescriptor->source);
                        } else {
                          pIEE[x].from = -1;
-                       }              
+                       }
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source IEE\n");
                    }
-                 
-                 offset = offset + length; 
+
+                 offset = offset + length;
                }
              break;
             case TAPETYPE:
+             free(pDTE);
               DTE = NoOfElements;
-              if ((pDTE = (ElementInfo_T *)malloc(sizeof(ElementInfo_T) * DTE)) == NULL)
-                {
-                  DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GenericElementStatus : malloc failed\n");
-                  return(-1);
-                }
-              memset(pDTE, 0, sizeof(ElementInfo_T) * DTE);
-             
+              pDTE = alloc(SIZEOF(ElementInfo_T) * DTE);
+              memset(pDTE, 0, SIZEOF(ElementInfo_T) * DTE);
+
               for (x = 0; x < NoOfElements; x++)
                 {
                  DataTransferElementDescriptor = (DataTransferElementDescriptor_T *)&DataBuffer[offset];
                   if (ElementStatusPage->pvoltag == 1)
                     {
-                      strncpy(pSTE[x].VolTag, 
-                              DataTransferElementDescriptor->pvoltag,
+                      strncpy(pSTE[x].VolTag,
+                              (char *)DataTransferElementDescriptor->pvoltag,
                               TAG_SIZE);
                       TerminateString(pSTE[x].VolTag, TAG_SIZE+1);
                     }
@@ -4318,8 +4524,13 @@ int GetElementStatus(int DeviceFD)
                   pDTE[x].address = V2(DataTransferElementDescriptor->address);
                   pDTE[x].except = DataTransferElementDescriptor->except;
                   pDTE[x].scsi = DataTransferElementDescriptor->scsi;
-                  pDTE[x].status = (DataTransferElementDescriptor->full > 0) ? 'F':'E';
                   pDTE[x].full = DataTransferElementDescriptor->full;
+                 if (DataTransferElementDescriptor->full > 0)
+                   {
+                     pDTE[x].status = 'F';
+                   } else {
+                     pDTE[x].status = 'E';
+                   }
 
                  if (length >= 5)
                    {
@@ -4327,14 +4538,14 @@ int GetElementStatus(int DeviceFD)
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASC DTE\n");
                    }
-                 
+
                  if (length >= 6)
                    {
                      pDTE[x].ASCQ = DataTransferElementDescriptor->ascq;
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip ASCQ DTE\n");
                    }
-                 
+
                  if (length >= 0xa)
                    {
                      if (DataTransferElementDescriptor->svalid == 1)
@@ -4346,16 +4557,17 @@ int GetElementStatus(int DeviceFD)
                    } else {
                      DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"Skip source STE\n");
                    }
-                 
-                 offset = offset + length; 
+
+                 offset = offset + length;
                 }
               break;
             default:
-              offset = offset + length; 
+              offset = offset + length;
               DebugPrint(DEBUG_ERROR, SECTION_ELEMENT,"GetElementStatus : UnGknown Type %d\n",ElementStatusPage->type);
               break;
             }
         }
+       free(DataBuffer);
     }
 
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"\n\n\tMedia Transport Elements (robot arms) :\n");
@@ -4373,7 +4585,7 @@ int GetElementStatus(int DeviceFD)
               pSTE[x].ASCQ, pSTE[x].type, pSTE[x].from, pSTE[x].VolTag);
 
   DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"\n\n\tData Transfer Elements (tape drives) :\n");
+
   for ( x = 0; x < DTE; x++)
     DebugPrint(DEBUG_INFO, SECTION_ELEMENT,"\t\tElement #%04d %c\n\t\t\tEXCEPT = %02X\n\t\t\tASC = %02X ASCQ = %02X\n\t\t\tType %d From = %04d\n\t\t\tTAG = %s\n\t\t\tSCSI ADDRESS = %d\n",
               pDTE[x].address, pDTE[x].status, pDTE[x].except, pDTE[x].ASC,
@@ -4388,7 +4600,6 @@ int GetElementStatus(int DeviceFD)
 
 
 
-  free(DataBuffer);
   return(0);
 }
 
@@ -4399,42 +4610,51 @@ int GetElementStatus(int DeviceFD)
  *
  * TODO
  */
-int RequestSense(int DeviceFD, ExtendedRequestSense_T *ExtendedRequestSense, int ClearErrorCounters )
+int
+RequestSense(
+    int                                DeviceFD,
+    ExtendedRequestSense_T *   ExtendedRequestSense,
+    int                                ClearErrorCounters)
 {
   CDB_T CDB;
   int ret;
-  
+
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START RequestSense\n");
-  
-  CDB[0] = SC_COM_REQUEST_SENSE;               /* REQUEST SENSE */                       
-  CDB[1] = 0;                                  /* Logical Unit Number = 0, Reserved */ 
-  CDB[2] = 0;                                  /* Reserved */              
+
+  CDB[0] = SC_COM_REQUEST_SENSE;               /* REQUEST SENSE */
+  CDB[1] = 0;                                  /* Logical Unit Number = 0, Reserved */
+  CDB[2] = 0;                                  /* Reserved */
   CDB[3] = 0;                                  /* Reserved */
-  CDB[4] = sizeof(ExtendedRequestSense_T);     /* Allocation Length */                    
-  CDB[5] = (ClearErrorCounters << 7) & 0x80;                 /*  */
-  
-  memset(ExtendedRequestSense, 0, sizeof(ExtendedRequestSense_T));
-  
-  ret = SCSI_Run(DeviceFD, Input, CDB, 6,                      
+  CDB[4] = (u_char)sizeof(ExtendedRequestSense_T);   /* Allocation Length */
+  CDB[5] = (u_char)((ClearErrorCounters << 7) & 0x80); /*  */
+
+  memset(ExtendedRequestSense, 0, SIZEOF(ExtendedRequestSense_T));
+
+  ret = SCSI_Run(DeviceFD, Input, CDB, 6,
                 (char *) ExtendedRequestSense,
-                sizeof(ExtendedRequestSense_T),  
-                (char *) ExtendedRequestSense, sizeof(ExtendedRequestSense_T));
-  
-  
+                SIZEOF(ExtendedRequestSense_T),
+                (RequestSense_T *) ExtendedRequestSense,
+                SIZEOF(ExtendedRequestSense_T));
+
+
   if (ret < 0)
     {
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP RequestSense (%d)\n",ret);
       return(ret);
+      /*NOTREACHED*/
     }
-  
+
   if ( ret > 0)
     {
       DecodeExtSense(ExtendedRequestSense, "RequestSense : ",debug_file);
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP RequestSense (%d)\n", ExtendedRequestSense->SenseKey);
       return(ExtendedRequestSense->SenseKey);
+      /*NOTREACHED*/
     }
-  
-  dump_hex((char *)ExtendedRequestSense , sizeof(ExtendedRequestSense_T) , DEBUG_INFO, SECTION_SCSI);
+
+  dump_hex((u_char *)ExtendedRequestSense ,
+          SIZEOF(ExtendedRequestSense_T),
+          DEBUG_INFO, SECTION_SCSI);
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP RequestSense (0)\n");
   return(0);
 }
@@ -4445,9 +4665,11 @@ int RequestSense(int DeviceFD, ExtendedRequestSense_T *ExtendedRequestSense, int
  */
 
 
-ElementInfo_T *LookupElement(int address)
+ElementInfo_T *
+LookupElement(
+    int                address)
 {
-  int x;
+  size_t x;
 
   dbprintf(("##### START LookupElement\n"));
 
@@ -4459,6 +4681,7 @@ ElementInfo_T *LookupElement(int address)
          {
             dbprintf(("##### STOP LookupElement (DTE)\n"));
             return(&pDTE[x]);
+           /*NOTREACHED*/
          }
         }
     }
@@ -4471,6 +4694,7 @@ ElementInfo_T *LookupElement(int address)
          {
             dbprintf(("##### STOP LookupElement (MTE)\n"));
             return(&pMTE[x]);
+           /*NOTREACHED*/
          }
         }
     }
@@ -4483,6 +4707,7 @@ ElementInfo_T *LookupElement(int address)
          {
             dbprintf(("##### STOP LookupElement (STE)\n"));
             return(&pSTE[x]);
+           /*NOTREACHED*/
          }
         }
     }
@@ -4495,11 +4720,13 @@ ElementInfo_T *LookupElement(int address)
          {
             dbprintf(("##### STOP LookupElement (IEE)\n"));
             return(&pIEE[x]);
+           /*NOTREACHED*/
          }
         }
     }
   return(NULL);
 }
+
 /*
  * Here comes everything what decode the log Pages
  *
@@ -4507,7 +4734,9 @@ ElementInfo_T *LookupElement(int address)
  * Fix the result handling from TestUnitReady
  *
  */
-int LogSense(DeviceFD)
+int
+LogSense(
+    int                DeviceFD)
 {
   extern OpenFiles_T *pDev;
   CDB_T CDB;
@@ -4516,38 +4745,34 @@ int LogSense(DeviceFD)
   LogParameter_T *LogParameter;
   struct LogPageDecode *p;
   int found;
-  char *datestamp = NULL;
-  char *label = NULL;
-  char *result = NULL;
   extern char *tapestatfile;
   int i;
-  int ParameterCode;
-  unsigned int value;
-  int length;
+  unsigned ParameterCode;
+  unsigned value;
+  size_t length;
   int count;
-  char *buffer;
-  char *logpages;
-  int nologpages;
-  int size = 128;
+  u_char *buffer;
+  u_char *logpages;
+  size_t nologpages;
+  size_t size = 128;
+
+  (void)DeviceFD;      /* Quiet unused parameter warning */
 
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### START LogSense\n");
 
-  if (tapestatfile != NULL && 
-      (StatFile = fopen(tapestatfile,"a")) != NULL && 
-      pDev[INDEX_TAPECTL].SCSI == 1) 
+  if ((tapestatfile != NULL) && (pDev[INDEX_TAPECTL].SCSI == 1) &&
+      ((StatFile = fopen(tapestatfile,"a")) != NULL))
     {
-      if ((pRequestSense  = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
+      pRequestSense = alloc(SIZEOF(RequestSense_T));
+
+      if (GenericRewind(INDEX_TAPECTL) < 0)
         {
-          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"LogSense : malloc failed\n");
-              return(-1);
-        }
-      
-      if (GenericRewind(INDEX_TAPECTL) < 0) 
-        { 
           DebugPrint(DEBUG_INFO, SECTION_TAPE,"LogSense : Rewind failed\n");
           free(pRequestSense);
-          return(0); 
-        } 
+         fclose(StatFile);
+          return(0);
+         /*NOTREACHED*/
+        }
       /*
        * Try to read the tape label
        */
@@ -4557,25 +4782,21 @@ int LogSense(DeviceFD)
            {
              SCSI_CloseDevice(INDEX_TAPE);
            }
-         
-         if ((result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &datestamp, &label)) == NULL)
+
+         if ((chgscsi_result = (char *)tape_rdlabel(pDev[INDEX_TAPE].dev, &chgscsi_datestamp, &chgscsi_label)) == NULL)
            {
-             fprintf(StatFile, "==== %s ==== %s ====\n", datestamp, label);
+             fprintf(StatFile, "==== %s ==== %s ====\n", chgscsi_datestamp, chgscsi_label);
            } else {
-             fprintf(StatFile, "%s\n", result);
+             fprintf(StatFile, "%s\n", chgscsi_result);
            }
        }
 
-      if ((buffer = (char *)malloc(size)) == NULL)
-        {
-          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"LogSense : malloc failed\n");
-          return(-1);
-        }
+      buffer = alloc(size);
       memset(buffer, 0, size);
       /*
-       * Get the known log pages 
+       * Get the known log pages
        */
-      
+
       CDB[0] = SC_COM_LOG_SENSE;
       CDB[1] = 0;
       CDB[2] = 0x40;    /* 0x40 for current values */
@@ -4585,65 +4806,64 @@ int LogSense(DeviceFD)
       CDB[6] = 00;
       MSB2(&CDB[7], size);
       CDB[9] = 0;
-      
-            if (SCSI_Run(INDEX_TAPECTL, Input, CDB, 10,
+
+      if (SCSI_Run(INDEX_TAPECTL, Input, CDB, 10,
                               buffer,
-                              size, 
-                              (char *)pRequestSense,
-                              sizeof(RequestSense_T)) != 0)
+                              size,
+                              pRequestSense,
+                              SIZEOF(RequestSense_T)) != 0)
         {
           DecodeSense(pRequestSense, "LogSense : ",debug_file);
-          free(buffer);
           free(pRequestSense);
+          free(buffer);
+         fclose(StatFile);
           return(0);
+         /*NOTREACHED*/
         }
-      
+
       LogSenseHeader = (LogSenseHeader_T *)buffer;
       nologpages = V2(LogSenseHeader->PageLength);
-      if ((logpages = (char *)malloc(nologpages)) == NULL)
-        {
-          DebugPrint(DEBUG_ERROR, SECTION_TAPE,"LogSense : malloc failed\n");
-          return(-1);
-        }
-      
-      memcpy(logpages, buffer + sizeof(LogSenseHeader_T), nologpages);
-      
-      for (count = 0; count < nologpages; count++) {
+      logpages = alloc(nologpages);
+
+      memcpy(logpages, buffer + SIZEOF(LogSenseHeader_T), nologpages);
+
+      for (count = 0; count < (int)nologpages; count++) {
         if (logpages[count] != 0  ) {
           memset(buffer, 0, size);
-          
-          
           CDB[0] = SC_COM_LOG_SENSE;
           CDB[1] = 0;
-          CDB[2] = 0x40 | logpages[count];    /* 0x40 for current values */
+          CDB[2] = (u_char)(0x40 | logpages[count]);/* 0x40 for current values */
           CDB[3] = 0;
           CDB[4] = 0;
           CDB[5] = 0;
           CDB[6] = 00;
           MSB2(&CDB[7], size);
           CDB[9] = 0;
-      
+
           if (SCSI_Run(INDEX_TAPECTL, Input, CDB, 10,
                                   buffer,
-                                  size, 
-                                  (char *)pRequestSense,
-                                  sizeof(RequestSense_T)) != 0)
-            { 
+                                  size,
+                                  pRequestSense,
+                                  SIZEOF(RequestSense_T)) != 0)
+            {
               DecodeSense(pRequestSense, "LogSense : ",debug_file);
-              free(buffer);
               free(pRequestSense);
+             free(logpages);
+              free(buffer);
+             fclose(StatFile);
               return(0);
+             /*NOTREACHED*/
             }
           LogSenseHeader = (LogSenseHeader_T *)buffer;
           length = V2(LogSenseHeader->PageLength);
-          LogParameter = (LogParameter_T *)(buffer + sizeof(LogSenseHeader_T));
+          LogParameter = (LogParameter_T *)(buffer + SIZEOF(LogSenseHeader_T));
           /*
            * Decode the log pages
            */
           p = (struct LogPageDecode *)&DecodePages;
           found = 0;
 
-         dump_hex((char *)LogParameter, 64, DEBUG_INFO, SECTION_SCSI);
+         dump_hex((u_char *)LogParameter, 64, DEBUG_INFO, SECTION_SCSI);
 
           while(p->ident != NULL) {
             if ((strcmp(pDev[INDEX_TAPECTL].ident, p->ident) == 0 ||strcmp("*", p->ident) == 0)  && p->LogPage == logpages[count]) {
@@ -4655,42 +4875,37 @@ int LogSense(DeviceFD)
             p++;
           }
 
-         /*
-         *  Hack to disable the printing of unknown pages
-         */
-         found = 1;
-
           if (!found) {
             fprintf(StatFile, "Logpage No %d = %x\n", count ,logpages[count]);
-      
-            while ((char *)LogParameter < (buffer + length)) {
+
+            while ((u_char *)LogParameter < (buffer + length)) {
               i = LogParameter->ParameterLength;
               ParameterCode = V2(LogParameter->ParameterCode);
               switch (i) {
               case 1:
-                value = V1((char *)LogParameter + sizeof(LogParameter_T));
+                value = V1((u_char *)LogParameter + SIZEOF(LogParameter_T));
                 fprintf(StatFile, "ParameterCode %02X = %u(%d)\n", ParameterCode, value, i);
                 break;
               case 2:
-                value = V2((char *)LogParameter + sizeof(LogParameter_T));
+                value = V2((u_char *)LogParameter + SIZEOF(LogParameter_T));
                 fprintf(StatFile, "ParameterCode %02X = %u(%d)\n", ParameterCode, value, i);
                 break;
               case 3:
-                value = V3((char *)LogParameter + sizeof(LogParameter_T));
+                value = V3((u_char *)LogParameter + SIZEOF(LogParameter_T));
                 fprintf(StatFile, "ParameterCode %02X = %u(%d)\n", ParameterCode, value, i);
                 break;
               case 4:
-                value = V4((char *)LogParameter + sizeof(LogParameter_T));
+                value = V4((u_char *)LogParameter + SIZEOF(LogParameter_T));
                 fprintf(StatFile, "ParameterCode %02X = %u(%d)\n", ParameterCode, value, i);
                 break;
               case 5:
-                value = V5((char *)LogParameter + sizeof(LogParameter_T));
+                value = V5((u_char *)LogParameter + SIZEOF(LogParameter_T));
                 fprintf(StatFile, "ParameterCode %02X = %u(%d)\n", ParameterCode, value, i);
                 break;
               default:
                 fprintf(StatFile, "ParameterCode %02X size %d\n", ParameterCode, i);
               }
-              LogParameter = (LogParameter_T *)((char *)LogParameter +  sizeof(LogParameter_T) + i);
+              LogParameter = (LogParameter_T *)((u_char *)LogParameter +  SIZEOF(LogParameter_T) + i);
             }
             fprintf(StatFile, "\n");
           }
@@ -4699,11 +4914,11 @@ int LogSense(DeviceFD)
 
       /*
        * Test only !!!!
-       * Reset the cumulative counters 
+       * Reset the cumulative counters
        */
       CDB[0] = SC_COM_LOG_SELECT;
       CDB[1] = 2;
-      CDB[2] = 0xc0;  
+      CDB[2] = 0xc0;
       CDB[3] = 0;
       CDB[4] = 0;
       CDB[5] = 0;
@@ -4711,38 +4926,49 @@ int LogSense(DeviceFD)
       CDB[7] = 0;
       CDB[8] = 0;
       CDB[9] = 0;
-      
-            if (SCSI_Run(INDEX_TAPECTL, Input, CDB, 10,
+
+      if (SCSI_Run(INDEX_TAPECTL, Input, CDB, 10,
                               buffer,
-                              size, 
-                              (char *)pRequestSense,
-                              sizeof(RequestSense_T)) != 0)
+                              size,
+                              pRequestSense,
+                              SIZEOF(RequestSense_T)) != 0)
         {
           DecodeSense(pRequestSense, "LogSense : ",debug_file);
-          free(buffer);
           free(pRequestSense);
+         free(logpages);
+         /*@ignore@*/
+          free(buffer);
+         /*@end@*/
+         fclose(StatFile);
           return(0);
+         /*NOTREACHED*/
         }
 
       free(pRequestSense);
+      free(logpages);
+      /*@ignore@*/
       free(buffer);
+      /*@end@*/
+      fclose(StatFile);
     }
   DebugPrint(DEBUG_INFO, SECTION_TAPE,"##### STOP LogSense\n");
-  
   return(0);
 }
 
-void WriteErrorCountersPage(LogParameter_T *buffer, int length)
+void
+WriteErrorCountersPage(
+    LogParameter_T *   buffer,
+    size_t             length)
 {
   int i;
-  int value;
+  unsigned value;
   LogParameter_T *LogParameter;
-  int ParameterCode;
+  unsigned ParameterCode;
   LogParameter = buffer;
 
   fprintf(StatFile, "\tWrite Error Counters Page\n");
 
-  while ((char *)LogParameter < ((char *)buffer + length)) {
+  while ((u_char *)LogParameter < ((u_char *)buffer + length)) {
     i = LogParameter->ParameterLength;
     ParameterCode = V2(LogParameter->ParameterCode);
 
@@ -4775,7 +5001,7 @@ void WriteErrorCountersPage(LogParameter_T *buffer, int length)
                 value);
         break;
       default:
-        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n", 
+        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n",
                 ParameterCode,
                 value, i);
         break;
@@ -4783,24 +5009,28 @@ void WriteErrorCountersPage(LogParameter_T *buffer, int length)
     } else {
       fprintf(StatFile, "Error decoding Result\n");
     }
-    LogParameter = (LogParameter_T *)((char *)LogParameter +  sizeof(LogParameter_T) + i);
+    LogParameter = (LogParameter_T *)((u_char *)LogParameter +  SIZEOF(LogParameter_T) + i);
   }
 }
 
-void ReadErrorCountersPage(LogParameter_T *buffer, int length)
+void
+ReadErrorCountersPage(
+    LogParameter_T *   buffer,
+    size_t             length)
 {
   int i;
-  int value;
+  unsigned value;
   LogParameter_T *LogParameter;
-  int ParameterCode;
+  unsigned ParameterCode;
   LogParameter = buffer;
 
   fprintf(StatFile, "\tRead Error Counters Page\n");
 
-  while ((char *)LogParameter < ((char *)buffer + length)) {
+  while ((u_char *)LogParameter < ((u_char *)buffer + length)) {
     i = LogParameter->ParameterLength;
     ParameterCode = V2(LogParameter->ParameterCode);
 
+    value = 0;
     if (Decode(LogParameter, &value) == 0) {
       switch (ParameterCode) {
       case 2:
@@ -4829,7 +5059,7 @@ void ReadErrorCountersPage(LogParameter_T *buffer, int length)
                 value);
         break;
       default:
-        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n", 
+        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n",
                 ParameterCode,
                 value, i);
         break;
@@ -4837,51 +5067,59 @@ void ReadErrorCountersPage(LogParameter_T *buffer, int length)
     } else {
       fprintf(StatFile, "Error decoding Result\n");
     }
-    LogParameter = (LogParameter_T *)((char *)LogParameter +  sizeof(LogParameter_T) + i);
+    LogParameter = (LogParameter_T *)((u_char *)LogParameter +  SIZEOF(LogParameter_T) + i);
   }
 }
 
-void C1553APage30(LogParameter_T *buffer, int length)
+void
+C1553APage30(
+    LogParameter_T *   buffer,
+    size_t             length)
 {
   int i;
-  int value;
+  unsigned value;
   LogParameter_T *LogParameter;
-  int ParameterCode;
+  unsigned ParameterCode;
   LogParameter = buffer;
 
   fprintf(StatFile, "\tData compression transfer Page\n");
 
-  while ((char *)LogParameter < ((char *)buffer + length)) {
+  while ((u_char *)LogParameter < ((u_char *)buffer + length)) {
     i = LogParameter->ParameterLength;
     ParameterCode = V2(LogParameter->ParameterCode);
 
+    value = 0;
     if (Decode(LogParameter, &value) == 0) {
       switch (ParameterCode) {
       default:
-        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n", 
+        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n",
                 ParameterCode,
                 value, i);
         break;
       }
     }
-    LogParameter = (LogParameter_T *)((char *)LogParameter +  sizeof(LogParameter_T) + i);
+    LogParameter = (LogParameter_T *)((u_char *)LogParameter +  SIZEOF(LogParameter_T) + i);
   }
 }
 
-void C1553APage37(LogParameter_T *buffer, int length)
+void
+C1553APage37(
+    LogParameter_T *   buffer,
+    size_t             length)
 {
   int i;
-  int value;
+  unsigned value;
   LogParameter_T *LogParameter;
-  int ParameterCode;
+  unsigned ParameterCode;
   LogParameter = buffer;
 
   fprintf(StatFile, "\tDrive Counters Page\n");
 
-  while ((char *)LogParameter < ((char *)buffer + length)) {
+  while ((u_char *)LogParameter < ((unsigned char *)buffer + length)) {
     i = LogParameter->ParameterLength;
     ParameterCode = V2(LogParameter->ParameterCode);
 
+    value = 0;
     if (Decode(LogParameter, &value) == 0) {
       switch (ParameterCode) {
       case 1:
@@ -4900,30 +5138,34 @@ void C1553APage37(LogParameter_T *buffer, int length)
                 value);
         break;
       default:
-        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n", 
+        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n",
                 ParameterCode,
                 value, i);
         break;
       }
     }
-    LogParameter = (LogParameter_T *)((char *)LogParameter +  sizeof(LogParameter_T) + i);
+    LogParameter = (LogParameter_T *)((u_char *)LogParameter +  SIZEOF(LogParameter_T) + i);
   }
 }
 
-void EXB85058HEPage39(LogParameter_T *buffer, int length)
+void
+EXB85058HEPage39(
+    LogParameter_T *   buffer,
+    size_t             length)
 {
   int i;
-  int value;
+  unsigned value;
   LogParameter_T *LogParameter;
-  int ParameterCode;
+  unsigned ParameterCode;
   LogParameter = buffer;
 
   fprintf(StatFile, "\tData Compression Page\n");
 
-  while ((char *)LogParameter < ((char *)buffer + length)) {
+  while ((u_char *)LogParameter < ((unsigned char *)buffer + length)) {
     i = LogParameter->ParameterLength;
     ParameterCode = V2(LogParameter->ParameterCode);
 
+    value = 0;
     if (Decode(LogParameter, &value) == 0) {
       switch (ParameterCode) {
       case 5:
@@ -4937,30 +5179,34 @@ void EXB85058HEPage39(LogParameter_T *buffer, int length)
                 value);
         break;
       default:
-        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n", 
+        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n",
                 ParameterCode,
                 value, i);
         break;
       }
     }
-    LogParameter = (LogParameter_T *)((char *)LogParameter +  sizeof(LogParameter_T) + i); 
+    LogParameter = (LogParameter_T *)((u_char *)LogParameter +  SIZEOF(LogParameter_T) + i);
   }
 }
 
-void EXB85058HEPage3c(LogParameter_T *buffer, int length)
+void
+EXB85058HEPage3c(
+    LogParameter_T *   buffer,
+    size_t             length)
 {
   int i;
-  int value;
+  unsigned value;
   LogParameter_T *LogParameter;
-  int ParameterCode;
+  unsigned ParameterCode;
   LogParameter = buffer;
 
   fprintf(StatFile, "\tDrive Usage Information Page\n");
 
-  while ((char *)LogParameter < ((char *)buffer + length)) {
+  while ((u_char *)LogParameter < ((unsigned char *)buffer + length)) {
     i = LogParameter->ParameterLength;
     ParameterCode = V2(LogParameter->ParameterCode);
 
+    value = 0;
     if (Decode(LogParameter, &value) == 0) {
       switch (ParameterCode) {
       case 1:
@@ -5004,52 +5250,61 @@ void EXB85058HEPage3c(LogParameter_T *buffer, int length)
       case 0x14:
         break;
       default:
-        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n", 
+        fprintf(StatFile, "Unknown ParameterCode %02X = %u(%d)\n",
                 ParameterCode,
                 value, i);
         break;
       }
     }
-    LogParameter = (LogParameter_T *)((char *)LogParameter +  sizeof(LogParameter_T) + i); 
+    LogParameter = (LogParameter_T *)((u_char *)LogParameter +  SIZEOF(LogParameter_T) + i);
   }
 }
 
-int Decode(LogParameter_T *LogParameter, int *value)
+int
+Decode(
+    LogParameter_T *   LogParameter,
+    unsigned *         value)
 {
 
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START Decode\n");
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"Decode Parameter with length %d\n", LogParameter->ParameterLength);
+
+  *value = 0;
   switch (LogParameter->ParameterLength) {
   case 1:
-    *value = V1((char *)LogParameter + sizeof(LogParameter_T));
+    *value = V1((u_char *)LogParameter + SIZEOF(LogParameter_T));
     break;
   case 2:
-    *value = V2((char *)LogParameter + sizeof(LogParameter_T));
+    *value = V2((u_char *)LogParameter + SIZEOF(LogParameter_T));
     break;
   case 3:
-    *value = V3((char *)LogParameter + sizeof(LogParameter_T));
+    *value = V3((u_char *)LogParameter + SIZEOF(LogParameter_T));
     break;
   case 4:
-    *value = V4((char *)LogParameter + sizeof(LogParameter_T));
+    *value = V4((u_char *)LogParameter + SIZEOF(LogParameter_T));
     break;
   case 5:
-    *value = V5((char *)LogParameter + sizeof(LogParameter_T));
+    *value = V5((u_char *)LogParameter + SIZEOF(LogParameter_T));
     break;
   case 6:
-    *value = V6((char *)LogParameter + sizeof(LogParameter_T));
+    *value = V6((u_char *)LogParameter + SIZEOF(LogParameter_T));
     break;
   default:
     fprintf(StatFile, "Can't decode ParameterCode %02X size %d\n",
             V2(LogParameter->ParameterCode), LogParameter->ParameterLength);
     DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP Decode (1)\n");
     return(1);
+    /*NOTREACHED*/
   }
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"Result = %d\n", *value);
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP Decode(0)\n");
   return(0);
 }
 
-void DumpDev(OpenFiles_T *p, char *device)
+void
+DumpDev(
+    OpenFiles_T *      p,
+    char *             device)
 {
        if (p != NULL)
        {
@@ -5063,52 +5318,71 @@ void DumpDev(OpenFiles_T *p, char *device)
        printf("\n");
 }
 
-void ChangerReplay(char *option)
+void
+ChangerReplay(
+    char *     option)
 {
-    char buffer[1024];
+    u_char buffer[1024];
     FILE *ip;
-    int x = 0, bufferx;
-   
+    int x;
+    unsigned bufferx;
+
+    (void)option;      /* Quiet unused parameter warning */
+
     if ((ip=fopen("/tmp/chg-scsi-trace", "r")) == NULL)
       {
        exit(1);
       }
-    
-    while (fscanf(ip, "%2x", &bufferx) != EOF)
+
+    for (x = 0; x < 1024; x++)
       {
-       buffer[x] = bufferx;
-       x++;
+        if (fscanf(ip, "%2x", &bufferx) == EOF) 
+         {
+           break;
+           /*NOTREACHED*/
+         }
+        buffer[x] = (u_char)bufferx;
+        x++;
       }
 
     DecodeModeSense(&buffer[0], 12, "DLT448ElementStatus :", 0, debug_file);
+    fclose(ip);
 }
 
 /*
  * Display all Information we can get about the library....
  */
-void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer_file, char *changer_dev, char *tape_device)
+void
+ChangerStatus(
+    char *     option,
+    char *     labelfile,
+    int                HasBarCode,
+    char *     changer_file,
+    char *     changer_dev,
+    char *     tape_device)
 {
   extern OpenFiles_T *pDev;
-  int x;
+  size_t x;
   FILE *out;
   ExtendedRequestSense_T ExtRequestSense;
-  MBC_T *pbarcoderes = malloc(sizeof(MBC_T));
-  
+  MBC_T *pbarcoderes;
+
   ChangerCMD_T *p = (ChangerCMD_T *)&ChangerIO;
-  memset(pbarcoderes, 0, sizeof(MBC_T));
+  pbarcoderes = alloc(SIZEOF(MBC_T));
+  memset(pbarcoderes, 0, SIZEOF(MBC_T));
 
-  if ((pModePage = (char *)malloc(0xff)) == NULL)
-    {
-      printf("malloc failed \n");
-      return;
-    }
+  if (pModePage == NULL) {
+        pModePage = alloc(0xff);
+  }
 
   if ((out = fdopen(1 , "w")) == NULL)
     {
       printf("Error fdopen stdout\n");
+      free(pbarcoderes);
       return;
+      /*NOTREACHED*/
     }
-  
+
   if (strcmp("types", option) == 0 || strcmp("all", option) == 0)
   {
     while(p->ident != NULL)
@@ -5126,7 +5400,10 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
             if (pDev[INDEX_CHANGER].functions->function_status(pDev[INDEX_CHANGER].fd, 1) != 0)
               {
                 printf("Can not initialize changer status\n");
+               free(pbarcoderes);
+               fclose(out);
                 return;
+               /*NOTREACHED*/
               }
           }
         /*      0123456789012345678901234567890123456789012 */
@@ -5137,8 +5414,8 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
                printf("Address Type Status From\n");
        }
         printf("-------------------------------------------\n");
-        
-        
+
+
         for ( x = 0; x < MTE; x++)
        if (HasBarCode)
        {
@@ -5149,10 +5426,11 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
          if (pMTE[x].full == 1)
            {
              pbarcoderes->action = BARCODE_BARCODE;
-             strcpy(pbarcoderes->data.barcode, pMTE[x].VolTag);
-             
+             strncpy(pbarcoderes->data.barcode, pMTE[x].VolTag,
+                     SIZEOF(pbarcoderes->data.barcode));
+
              if (MapBarCode(labelfile, pbarcoderes) == 0 )
-               { 
+               {
                  printf("No mapping\n");
                } else {
                  printf("%s \n",pbarcoderes->data.voltag);
@@ -5165,20 +5443,21 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
                  (pMTE[x].full ? "Full " :"Empty"),
                  pMTE[x].from);
        }
-        
-        
+
+
         for ( x = 0; x < STE; x++)
        if (HasBarCode)
        {
-          printf("%07d STE  %s  %04d %s ",pSTE[x].address,  
+          printf("%07d STE  %s  %04d %s ",pSTE[x].address,
                  (pSTE[x].full ? "Full ":"Empty"),
                  pSTE[x].from, pSTE[x].VolTag);
 
          if (pSTE[x].full == 1)
            {
              pbarcoderes->action = BARCODE_BARCODE;
-             strcpy(pbarcoderes->data.barcode, pSTE[x].VolTag);
-             
+             strncpy(pbarcoderes->data.barcode, pSTE[x].VolTag,
+                     SIZEOF(pbarcoderes->data.barcode));
+
              if (MapBarCode(labelfile, pbarcoderes) == 0 )
                {
                  printf("No mapping\n");
@@ -5189,24 +5468,25 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
              printf("\n");
            }
        } else {
-          printf("%07d STE  %s  %04d %s\n",pSTE[x].address,  
+          printf("%07d STE  %s  %04d %s\n",pSTE[x].address,
                  (pSTE[x].full ? "Full ":"Empty"),
                  pSTE[x].from, pSTE[x].VolTag);
        }
-        
-        
+
+
         for ( x = 0; x < DTE; x++)
        if (HasBarCode)
        {
-          printf("%07d DTE  %s  %04d %s ",pDTE[x].address,  
+          printf("%07d DTE  %s  %04d %s ",pDTE[x].address,
                  (pDTE[x].full ? "Full " : "Empty"),
                  pDTE[x].from, pDTE[x].VolTag);
 
          if (pDTE[x].full == 1)
            {
              pbarcoderes->action = BARCODE_BARCODE;
-             strcpy(pbarcoderes->data.barcode, pDTE[x].VolTag);
-             
+             strncpy(pbarcoderes->data.barcode, pDTE[x].VolTag,
+                     SIZEOF(pbarcoderes->data.barcode));
+
              if (MapBarCode(labelfile, pbarcoderes) == 0 )
                {
                  printf("No mapping\n");
@@ -5218,23 +5498,24 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
            }
 
        } else {
-          printf("%07d DTE  %s  %04d %s\n",pDTE[x].address,  
+          printf("%07d DTE  %s  %04d %s\n",pDTE[x].address,
                  (pDTE[x].full ? "Full " : "Empty"),
                  pDTE[x].from, pDTE[x].VolTag);
        }
-        
+
         for ( x = 0; x < IEE; x++)
        if (HasBarCode)
-       {       
-          printf("%07d IEE  %s  %04d %s ",pIEE[x].address,  
+       {
+          printf("%07d IEE  %s  %04d %s ",pIEE[x].address,
                  (pIEE[x].full ? "Full " : "Empty"),
                  pIEE[x].from, pIEE[x].VolTag);
 
          if (pIEE[x].full == 1)
            {
              pbarcoderes->action = BARCODE_BARCODE;
-             strcpy(pbarcoderes->data.barcode, pIEE[x].VolTag);
-             
+             strncpy(pbarcoderes->data.barcode, pIEE[x].VolTag,
+                     SIZEOF(pbarcoderes->data.barcode));
+
              if (MapBarCode(labelfile, pbarcoderes) == 0 )
                {
                  printf("No mapping\n");
@@ -5246,11 +5527,11 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
            }
 
        } else {
-          printf("%07d IEE  %s  %04d %s\n",pIEE[x].address,  
+          printf("%07d IEE  %s  %04d %s\n",pIEE[x].address,
                  (pIEE[x].full ? "Full " : "Empty"),
                  pIEE[x].from, pIEE[x].VolTag);
        }
-        
+
       }
 
   if (strcmp("sense", option) == 0 || strcmp("all", option) == 0)
@@ -5261,12 +5542,12 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
            RequestSense(INDEX_CHANGER , &ExtRequestSense, 0);
            DecodeExtSense(&ExtRequestSense, "", out);
        }
-      
+
       if (pDev[INDEX_TAPE].SCSI == 1)
         {
           printf("\n");
           printf("Sense Status from tape (tapectl):\n");
-          RequestSense(INDEX_TAPE, &ExtRequestSense, 0); 
+          RequestSense(INDEX_TAPE, &ExtRequestSense, 0);
           DecodeExtSense(&ExtRequestSense, "", out);
         }
 
@@ -5274,7 +5555,7 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
         {
           printf("\n");
           printf("Sense Status from tape (tapectl):\n");
-          RequestSense(INDEX_TAPECTL, &ExtRequestSense, 0); 
+          RequestSense(INDEX_TAPECTL, &ExtRequestSense, 0);
           DecodeExtSense(&ExtRequestSense, "", out);
         }
     }
@@ -5284,10 +5565,10 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
         printf("\n");
         if (SCSI_ModeSense(INDEX_CHANGER, pModePage, 0xff, 0x08, 0x3f) == 0)
           {
-            DecodeModeSense(pModePage, 0, "Changer :" , 0, out); 
+            DecodeModeSense(pModePage, 0, "Changer :" , 0, out);
           }
       }
-  
+
     if (strcmp("ModeSenseTape", option) == 0 || strcmp("all", option) == 0)
       {
         if (pDev[INDEX_TAPECTL].SCSI == 1)
@@ -5295,7 +5576,7 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
           printf("\n");
           if (SCSI_ModeSense(INDEX_TAPECTL, pModePage, 0xff, 0x0, 0x3f) == 0)
             {
-              DecodeModeSense(pModePage, 0, "Tape :" , 1, out); 
+              DecodeModeSense(pModePage, 0, "Tape :" , 1, out);
             }
         }
       }
@@ -5311,27 +5592,35 @@ void ChangerStatus(char *option, char * labelfile, int HasBarCode, char *changer
     }
 
   if (GenericClean("") == 1)
-    printf("Tape needs cleaning\n");  
+    printf("Tape needs cleaning\n");
+
+  free(pbarcoderes);
+  fclose(out);
 }
 
-void dump_hex(char *p, int size, int level, int section)
+void
+dump_hex(
+    u_char *   p,
+    size_t     size,
+    int                level,
+    int                section)
 {
-    int row_count = 0;
-    int x = 0;
+    size_t row_count = 0;
+    int x;
 
     while (row_count < size)
     {
-        DebugPrint(level, section,"%02X ", (unsigned char)p[row_count]);
-        if (((row_count + 1) % 16) == 0 )
+        DebugPrint(level, section,"%02X ", (u_char)p[row_count]);
+        if (((row_count + 1) % 16) == 0)
           {
             dbprintf(("   "));
-            for (x = 16; x>0;x--)
+            for (x = 16; x > 0; x--)
               {
-            if (isalnum((unsigned char)p[row_count - x + 1 ]))
-              DebugPrint(level, section,"%c",(unsigned char)p[row_count - x + 1]);
-            else
-              DebugPrint(level, section,".");
-              }
+               if (isalnum((u_char)p[row_count - x + 1 ]))
+                 DebugPrint(level, section,"%c",(u_char)p[row_count - x + 1]);
+               else
+                 DebugPrint(level, section,".");
+             }
             DebugPrint(level, section,"\n");
           }
        row_count++;
@@ -5339,19 +5628,28 @@ void dump_hex(char *p, int size, int level, int section)
     DebugPrint(level, section,"\n");
 }
 
-void TerminateString(char *string, int length)
+void
+TerminateString(
+    char *     string,
+    size_t     length)
 {
-  int x;
-  
-  for (x = length; x >= 0 && !isalnum((int)string[x]); x--)
+  ssize_t x;
+
+  for (x = (ssize_t)length; x >= 0 && !isalnum((int)string[x]); x--)
     string[x] = '\0';
 }
 
-void ChgExit(char *where, char *reason, int level)
+void
+ChgExit(
+    char *     where,
+    char *     reason,
+    int level)
 {
+    (void)level;       /* Quiet unused parameter warning */
+
    dbprintf(("ChgExit in %s, reason %s\n", where, reason));
    fprintf(stderr,"%s\n",reason);
-   exit(2); 
+   exit(2);
 }
 
 /* OK here starts a new set of functions.
@@ -5365,20 +5663,26 @@ void ChgExit(char *where, char *reason, int level)
  * is ready for accepting commands, and if this is true send
  * the command
  */
-int SCSI_Run(int DeviceFD,
-            Direction_T Direction,
-            CDB_T CDB,
-            int CDB_Length,
-            void *DataBuffer,
-            int DataBufferLength,
-            char *pRequestSense,
-            int RequestSenseLength)
+int
+SCSI_Run(
+    int                        DeviceFD,
+    Direction_T                Direction,
+    CDB_T              CDB,
+    size_t             CDB_Length,
+    void *             DataBuffer,
+    size_t             DataBufferLength,
+    RequestSense_T *   pRequestSense,
+    size_t             RequestSenseLength)
 {
   int ret = 0;
   int ok = 0;
   int maxtries = 0;
   RequestSense_T *pRqS;
 
+  /* Basic sanity checks */
+  assert(CDB_Length <= UCHAR_MAX);
+  assert(RequestSenseLength <= UCHAR_MAX);
+
   pRqS = (RequestSense_T *)pRequestSense;
 
   DebugPrint(DEBUG_INFO, SECTION_SCSI, "SCSI_Run TestUnitReady\n");
@@ -5392,7 +5696,7 @@ int SCSI_Run(int DeviceFD,
          ok=1;
          break;
        case SCSI_SENSE:
-         switch (SenseHandler(DeviceFD, 0, pRqS->SenseKey, pRqS->AdditionalSenseCode, pRqS->AdditionalSenseCodeQualifier, pRequestSense))
+         switch (SenseHandler(DeviceFD, 0, pRqS->SenseKey, pRqS->AdditionalSenseCode, pRqS->AdditionalSenseCodeQualifier, pRqS))
            {
            case SENSE_NO:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run (TestUnitReady) SENSE_NO\n");
@@ -5409,7 +5713,7 @@ int SCSI_Run(int DeviceFD,
            case SENSE_ABORT:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_Run (TestUnitReady) SENSE_ABORT\n");
              return(-1);
-             break;
+             /*NOTREACHED*/
            case SENSE_RETRY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run (TestUnitReady) SENSE_RETRY\n");
              break;
@@ -5422,7 +5726,7 @@ int SCSI_Run(int DeviceFD,
        case SCSI_ERROR:
          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_Run (TestUnitReady) SCSI_ERROR\n");
          return(-1);
-         break;     
+         /*NOTREACHED*/
        case SCSI_BUSY:
          DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run (TestUnitReady) SCSI_BUSY\n");
          break;
@@ -5439,13 +5743,14 @@ int SCSI_Run(int DeviceFD,
         maxtries++;
       }
     }
-  
+
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run TestUnitReady after %d sec:\n",maxtries);
-  
+
   if (ok != 1)
     {
       DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_Run Exit %d\n",ret);
       return(-1);
+      /*NOTREACHED*/
     }
 
   ok = 0;
@@ -5460,7 +5765,7 @@ int SCSI_Run(int DeviceFD,
                                DataBufferLength,
                                pRequestSense,
                                RequestSenseLength);
-      
+
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run Exit %d\n",ret);
       switch (ret)
        {
@@ -5468,7 +5773,7 @@ int SCSI_Run(int DeviceFD,
          ok=1;
          break;
        case SCSI_SENSE:
-         switch (SenseHandler(DeviceFD, 0, pRqS->SenseKey, pRqS->AdditionalSenseCode, pRqS->AdditionalSenseCodeQualifier, pRequestSense))
+         switch (SenseHandler(DeviceFD, 0, pRqS->SenseKey, pRqS->AdditionalSenseCode, pRqS->AdditionalSenseCodeQualifier, pRqS))
            {
            case SENSE_NO:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run SENSE_NO\n");
@@ -5485,7 +5790,7 @@ int SCSI_Run(int DeviceFD,
            case SENSE_ABORT:
              DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_Run SENSE_ABORT\n");
              return(-1);
-             break;
+             /*NOTREACHED*/
            case SENSE_RETRY:
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run SENSE_RETRY\n");
              break;
@@ -5498,7 +5803,7 @@ int SCSI_Run(int DeviceFD,
        case SCSI_ERROR:
          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_Run SCSI_ERROR\n");
          return(-1);
-         break;
+         /*NOTREACHED*/
        case SCSI_BUSY:
          DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Run SCSI_BUSY\n");
          break;
@@ -5512,36 +5817,37 @@ int SCSI_Run(int DeviceFD,
       maxtries++;
       sleep(1);
     }
-  
+
   if (ok == 1)
     {
       return(0);
-    } else {
-      return(-1);
+      /*NOTREACHED*/
     }
+  return(-1);
 }
 
-/*                                       
- * This a vendor specific command !!!!!! 
- * First seen at AIT :-)                 
- */                                       
-int SCSI_AlignElements(int DeviceFD, int AE_MTE, int AE_DTE, int AE_STE)
+/*
+ * This a vendor specific command !!!!!!
+ * First seen at AIT :-)
+ */
+int
+SCSI_AlignElements(
+    int                DeviceFD,
+    size_t     AE_MTE,
+    size_t     AE_DTE,
+    size_t     AE_STE)
 {
   RequestSense_T *pRequestSense;
-  int retry = 1;
+  int retry;
   CDB_T CDB;
   int ret;
   int i;
-  
+
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START SCSI_AlignElements\n");
-  
-  if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-    {
-      DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_AlignElements : malloc failed\n");
-      return(-1);
-    }
-  
-  while (retry > 0 && retry < MAX_RETRIES)
+
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
+
+  for (retry = 0; retry < MAX_RETRIES; retry++)
     {
       CDB[0]  = 0xE5;
       CDB[1]  = 0;
@@ -5552,74 +5858,79 @@ int SCSI_AlignElements(int DeviceFD, int AE_MTE, int AE_DTE, int AE_STE)
       CDB[9]  = 0;
       CDB[10] = 0;
       CDB[11] = 0;
-      
+
       ret = SCSI_Run(DeviceFD, Input, CDB, 12,
-                                NULL, 0, (char *)pRequestSense, sizeof(RequestSense_T)); 
+                                NULL, 0, pRequestSense, SIZEOF(RequestSense_T));
 
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_AlignElements : SCSI_Run = %d\n", ret);
       DecodeSense(pRequestSense, "SCSI_AlignElements :",debug_file);
 
       if (ret < 0)
         {
-          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"%s: Request Sense[Inquiry]: %02X", 
-                    "chs", ((unsigned char *) &pRequestSense)[0]); 
-          for (i = 1; i < sizeof(RequestSense_T); i++)                
-            DebugPrint(DEBUG_ERROR, SECTION_SCSI," %02X", ((unsigned char *) &pRequestSense)[i]); 
-          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"\n");    
+          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"%s: Request Sense[Inquiry]: %02X",
+                    "chs", ((u_char *) &pRequestSense)[0]);
+          for (i = 1; i < (int)sizeof(RequestSense_T); i++)
+            DebugPrint(DEBUG_ERROR, SECTION_SCSI," %02X", ((u_char *) &pRequestSense)[i]);
+          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"\n");
           return(ret);
+         /*NOTREACHED*/
         }
       if ( ret > 0)
         {
-          switch(SenseHandler(DeviceFD, 0 , pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+          switch(SenseHandler(DeviceFD, 0 , pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
             {
             case SENSE_IGNORE:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_AlignElements : SENSE_IGNORE\n");
               return(0);
-              break;
+              /*NOTREACHED*/
             case SENSE_RETRY:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_AlignElements : SENSE_RETRY no %d\n", retry);
               break;
             case SENSE_ABORT:
               DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_AlignElements : SENSE_ABORT\n");
               return(-1);
-              break;
+              /*NOTREACHED*/
             case SENSE_TAPE_NOT_UNLOADED:
               DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_AlignElements : Tape still loaded, eject failed\n");
               return(-1);
-              break;
+              /*NOTREACHED*/
             default:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_AlignElements : end %d\n", pRequestSense->SenseKey);
               return(pRequestSense->SenseKey);
-              break;
+              /*NOTREACHED*/
             }
         }
       if (ret == 0)
         {
           DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_AlignElements : end %d\n", ret);
           return(ret);
-        } 
+         /*NOTREACHED*/
+        }
     }
-  return(ret);
+  DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_AlignElements :"
+            "Retries exceeded = %d\n", retry);
+  return(-1);
 }
 
 
-int SCSI_Move(int DeviceFD, unsigned char chm, int from, int to)
+int
+SCSI_Move(
+    int                DeviceFD,
+    u_char     chm,
+    int                from,
+    int                to)
 {
   RequestSense_T *pRequestSense;
-  int retry = 1;
+  int retry;
   CDB_T CDB;
-  int ret;
+  int ret = -1;
   int i;
 
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START SCSI_Move\n");
 
-  if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-    {
-      DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_Move : malloc failed\n");
-      return(-1);
-    }
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
 
-  while (retry > 0 && retry < MAX_RETRIES)
+  for (retry = 0; (ret != 0) && (retry < MAX_RETRIES); retry++)
     {
       CDB[0]  = SC_MOVE_MEDIUM;
       CDB[1]  = 0;
@@ -5631,86 +5942,92 @@ int SCSI_Move(int DeviceFD, unsigned char chm, int from, int to)
       CDB[9]  = 0;
       CDB[10] = 0;
       CDB[11] = 0;
-      
+
       ret = SCSI_Run(DeviceFD, Input, CDB, 12,
-                                NULL, 0, (char *)pRequestSense, sizeof(RequestSense_T)); 
+                                NULL, 0, pRequestSense, SIZEOF(RequestSense_T));
 
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Move : SCSI_Run = %d\n", ret);
       DecodeSense(pRequestSense, "SCSI_Move :",debug_file);
 
       if (ret < 0)
         {
-          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"%s: Request Sense[Inquiry]: %02X", 
-                    "chs", ((unsigned char *) &pRequestSense)[0]); 
-          for (i = 1; i < sizeof(RequestSense_T); i++)                
-            DebugPrint(DEBUG_ERROR, SECTION_SCSI," %02X", ((unsigned char *) &pRequestSense)[i]); 
-          DebugPrint(DEBUG_INFO, SECTION_SCSI,"\n");    
+          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"%s: Request Sense[Inquiry]: %02X",
+                    "chs", ((u_char *) &pRequestSense)[0]);
+          for (i = 1; i < (int)sizeof(RequestSense_T); i++)
+            DebugPrint(DEBUG_ERROR, SECTION_SCSI," %02X", ((u_char *) &pRequestSense)[i]);
+          DebugPrint(DEBUG_INFO, SECTION_SCSI,"\n");
           return(ret);
+         /*NOTREACHED*/
         }
       if ( ret > 0)
         {
-          switch(SenseHandler(DeviceFD,  0 , pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+          switch(SenseHandler(DeviceFD,  0 , pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
             {
             case SENSE_IGNORE:
               dbprintf(("SCSI_Move : SENSE_IGNORE\n"));
               return(0);
-              break;
+              /*NOTREACHED*/
             case SENSE_RETRY:
               dbprintf(("SCSI_Move : SENSE_RETRY no %d\n", retry));
               break;
             case SENSE_ABORT:
               dbprintf(("SCSI_Move : SENSE_ABORT\n"));
               return(-1);
-              break;
+              /*NOTREACHED*/
             case SENSE_TAPE_NOT_UNLOADED:
               dbprintf(("SCSI_Move : Tape still loaded, eject failed\n"));
               return(-1);
-              break;
+              /*NOTREACHED*/
             default:
               dbprintf(("SCSI_Move : end %d\n", pRequestSense->SenseKey));
               return(pRequestSense->SenseKey);
-              break;
+              /*NOTREACHED*/
             }
         }
-      if (ret == 0)
-        {
-          dbprintf(("SCSI_Move : end %d\n", ret));
-          return(ret);
-        } 
     }
+  dbprintf(("SCSI_Move : end %d\n", ret));
   return(ret);
 }
 
-int SCSI_LoadUnload(int DeviceFD, RequestSense_T *pRequestSense, unsigned char byte1, unsigned char load)
+int
+SCSI_LoadUnload(
+    int                        DeviceFD,
+    RequestSense_T *   pRequestSense,
+    u_char             byte1,
+    u_char             load)
 {
   CDB_T CDB;
   int ret;
 
   dbprintf(("##### START SCSI_LoadUnload\n"));
-  
+
   CDB[0] = SC_COM_UNLOAD;
-  CDB[1] = byte1;             
+  CDB[1] = byte1;
   CDB[2] = 0;
   CDB[3] = 0;
   CDB[4] = load;
   CDB[5] = 0;
-  
+
+
   ret = SCSI_Run(DeviceFD, Input, CDB, 6,
-                            NULL, 0, 
-                            (char *) pRequestSense,
-                            sizeof(RequestSense_T));
-    
+                            NULL, 0,
+                            pRequestSense,
+                            SIZEOF(RequestSense_T));
+
   if (ret < 0)
     {
       dbprintf(("SCSI_Unload : failed %d\n", ret));
       return(-1);
-    } 
+      /*NOTREACHED*/
+    }
 
   return(ret);
 }
 
-int SCSI_TestUnitReady(int DeviceFD, RequestSense_T *pRequestSense)
+int
+SCSI_TestUnitReady(
+    int                        DeviceFD,
+    RequestSense_T *   pRequestSense)
 {
   CDB_T CDB;
   int ret;
@@ -5725,17 +6042,18 @@ int SCSI_TestUnitReady(int DeviceFD, RequestSense_T *pRequestSense)
   CDB[5] = 0;
 
   ret = SCSI_ExecuteCommand(DeviceFD, Input, CDB, 6,
-                      NULL, 0, 
-                      (char *) pRequestSense,
-                      sizeof(RequestSense_T));
+                      NULL, (size_t)0,
+                      pRequestSense,
+                      SIZEOF(RequestSense_T));
 
   /*
-   * We got an error, so let the calling function handle this 
+   * We got an error, so let the calling function handle this
    */
   if (ret > 0)
     {
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"###### STOP SCSI_TestUnitReady (1)\n");
       return(ret);
+      /*NOTREACHED*/
     }
 
   /*
@@ -5746,6 +6064,7 @@ int SCSI_TestUnitReady(int DeviceFD, RequestSense_T *pRequestSense)
     {
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"###### STOP SCSI_TestUnitReady (1)\n");
       return(0);
+      /*NOTREACHED*/
     }
 
   /*
@@ -5756,87 +6075,93 @@ int SCSI_TestUnitReady(int DeviceFD, RequestSense_T *pRequestSense)
 }
 
 
-int SCSI_ModeSelect(int DeviceFD, char *buffer, unsigned char length, unsigned char save, unsigned char mode, unsigned char lun)
+int
+SCSI_ModeSelect(
+    int                DeviceFD,
+    u_char *   buffer,
+    u_char     length,
+    u_char     save,
+    u_char     mode,
+    u_char     lun)
 {
   CDB_T CDB;
   RequestSense_T *pRequestSense;
-  int ret;
-  int retry = 1;
-  char *sendbuf;
-  
-  dbprintf(("##### START SCSI_ModeSelect\n"));
-
-  dbprintf(("SCSI_ModeSelect start length = %d:\n", length));
-  if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-      {
-          dbprintf(("SCSI_ModeSelect : malloc failed\n"));
-          return(-1);
-      }
+  int ret = -1;
+  int retry;
+  u_char *sendbuf;
 
-  
-  if ((sendbuf = (char *)malloc(length + 4)) == NULL)
-    {
-      dbprintf(("SCSI_ModeSelect : malloc failed\n"));
-      return(-1);
-    }
+  dbprintf(("##### START SCSI_ModeSelect\n"));
 
-  memset(sendbuf, 0 , length + 4);
+  dbprintf(("SCSI_ModeSelect start length = %u:\n", (unsigned)length));
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
+  sendbuf = alloc((size_t)length + 4);
+  memset(sendbuf, 0 , (size_t)length + 4);
 
-  memcpy(&sendbuf[4], buffer, length);
-  dump_hex(sendbuf, length+4, DEBUG_INFO, SECTION_SCSI);
+  memcpy(&sendbuf[4], buffer, (size_t)length);
+  dump_hex(sendbuf, (size_t)length+4, DEBUG_INFO, SECTION_SCSI);
 
-  while (retry > 0 && retry < MAX_RETRIES)
+  for (retry = 0; (ret != 0) && (retry < MAX_RETRIES); retry++)
     {
-      memset(pRequestSense, 0, sizeof(RequestSense_T));
-      
+      memset(pRequestSense, 0, SIZEOF(RequestSense_T));
+
       CDB[0] = SC_COM_MODE_SELECT;
-      CDB[1] = ((lun << 5) & 0xF0) | ((mode << 4) & 0x10) | (save & 1);
+      CDB[1] = (u_char)(((lun << 5) & 0xF0) | ((mode << 4) & 0x10) | (save & 1));
       CDB[2] = 0;
       CDB[3] = 0;
-      CDB[4] = length + 4;
+      CDB[4] = (u_char)(length + 4);
       CDB[5] = 0;
-      ret = SCSI_Run(DeviceFD, Output, CDB, 6,                      
+      ret = SCSI_Run(DeviceFD, Output, CDB, 6,
                                 sendbuf,
-                                length + 4, 
-                                (char *) pRequestSense,
-                                sizeof(RequestSense_T));
+                                (size_t)length + 4,
+                                pRequestSense,
+                                SIZEOF(RequestSense_T));
       if (ret < 0)
         {
           dbprintf(("SCSI_ModeSelect : ret %d\n", ret));
-          return(ret);
+         goto done;
+          /*NOTREACHED*/
         }
-      
+
       if ( ret > 0)
         {
-          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey,
+                             pRequestSense->AdditionalSenseCode,
+                             pRequestSense->AdditionalSenseCodeQualifier,
+                             pRequestSense))
             {
             case SENSE_IGNORE:
               dbprintf(("SCSI_ModeSelect : SENSE_IGNORE\n"));
-              return(0);
-              break;
+             goto done;
+              /*NOTREACHED*/
+
             case SENSE_RETRY:
               dbprintf(("SCSI_ModeSelect : SENSE_RETRY no %d\n", retry));
               break;
+
             default:
-              dbprintf(("SCSI_ModeSelect : end %d\n", pRequestSense->SenseKey));
-              return(pRequestSense->SenseKey);
-              break;
+             ret = pRequestSense->SenseKey;
+             goto end;
             }
         }
-      retry++;
-      if (ret == 0)
-        {
-          dbprintf(("SCSI_ModeSelect end: %d\n", ret));
-          return(ret);
-        }
     }
+end:
   dbprintf(("SCSI_ModeSelect end: %d\n", ret));
+
+done:
+  free(pRequestSense);
+  free(sendbuf);
   return(ret);
 }
 
 
 
-int SCSI_ModeSense(int DeviceFD, char *buffer, u_char size, u_char byte1, u_char byte2)
+int
+SCSI_ModeSense(
+    int                DeviceFD,
+    u_char *   buffer,
+    u_char     size,
+    u_char     byte1,
+    u_char     byte2)
 {
   CDB_T CDB;
   RequestSense_T *pRequestSense;
@@ -5846,48 +6171,45 @@ int SCSI_ModeSense(int DeviceFD, char *buffer, u_char size, u_char byte1, u_char
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START SCSI_ModeSense\n");
 
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense start length = %d:\n", size);
-  if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-      {
-          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_ModeSense : malloc failed\n");
-          return(-1);
-      }
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
 
   while (ret && retry < MAX_RETRIES)
     {
-      memset(pRequestSense, 0, sizeof(RequestSense_T));
+      memset(pRequestSense, 0, SIZEOF(RequestSense_T));
       memset(buffer, 0, size);
-      
+
       CDB[0] = SC_COM_MODE_SENSE;
       CDB[1] = byte1;
       CDB[2] = byte2;
       CDB[3] = 0;
       CDB[4] = size;
       CDB[5] = 0;
-      ret = SCSI_Run(DeviceFD, Input, CDB, 6,                      
+      ret = SCSI_Run(DeviceFD, Input, CDB, 6,
                                 buffer,
-                                size, 
-                                (char *) pRequestSense,
-                                sizeof(RequestSense_T));
+                                size,
+                                pRequestSense,
+                                SIZEOF(RequestSense_T));
       if (ret < 0)
         {
           return(ret);
+         /*NOTREACHED*/
         }
-      
+
       if ( ret > 0)
         {
-          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
             {
             case SENSE_IGNORE:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense : SENSE_IGNORE\n");
               return(0);
-              break;
+              /*NOTREACHED*/
             case SENSE_RETRY:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense : SENSE_RETRY no %d\n", retry);
               break;
             default:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense : end %d\n", pRequestSense->SenseKey);
               return(pRequestSense->SenseKey);
-              break;
+              /*NOTREACHED*/
             }
         }
       retry++;
@@ -5897,23 +6219,25 @@ int SCSI_ModeSense(int DeviceFD, char *buffer, u_char size, u_char byte1, u_char
   return(ret);
 }
 
-int SCSI_Inquiry(int DeviceFD, SCSIInquiry_T *buffer, u_char size)
+int
+SCSI_Inquiry(
+    int                        DeviceFD,
+    SCSIInquiry_T *    buffer,
+    size_t             size)
 {
   CDB_T CDB;
   RequestSense_T *pRequestSense;
   int i;
-  int ret;
+  int ret = -1;
   int retry = 1;
 
+  assert(size <= UCHAR_MAX);
+
   DebugPrint(DEBUG_INFO, SECTION_SCSI, "##### START SCSI_Inquiry\n");
 
   DebugPrint(DEBUG_INFO, SECTION_SCSI, "SCSI_Inquiry start length = %d:\n", size);
 
-  if ((pRequestSense = (RequestSense_T *)malloc(size)) == NULL)
-      {
-          DebugPrint(DEBUG_ERROR, SECTION_SCSI,"SCSI_Inquiry : malloc failed\n");
-          return(-1);
-      }
+  pRequestSense = alloc((size_t)size);
 
   while (retry > 0 && retry < MAX_RETRIES)
     {
@@ -5922,146 +6246,138 @@ int SCSI_Inquiry(int DeviceFD, SCSIInquiry_T *buffer, u_char size)
       CDB[1] = 0;
       CDB[2] = 0;
       CDB[3] = 0;
-      CDB[4] = size;
+      CDB[4] = (u_char)size;
       CDB[5] = 0;
-      
-      ret = SCSI_ExecuteCommand(DeviceFD, Input, CDB, 6,                      
+
+      ret = SCSI_ExecuteCommand(DeviceFD, Input, CDB, 6,
                                 buffer,
-                                size, 
-                                (char *) pRequestSense,
-                            sizeof(RequestSense_T));
+                                size,
+                                pRequestSense,
+                                SIZEOF(RequestSense_T));
       if (ret < 0)
         {
           DebugPrint(DEBUG_ERROR, SECTION_SCSI,"%s: Request Sense[Inquiry]: %02X",
-                    "chs", ((unsigned char *) pRequestSense)[0]);
-          for (i = 1; i < sizeof(RequestSense_T); i++)               
-            DebugPrint(DEBUG_ERROR, SECTION_SCSI," %02X", ((unsigned char *) pRequestSense)[i]);
-          DebugPrint(DEBUG_ERROR, SECTION_SCSI, "\n");   
-      DebugPrint(DEBUG_ERROR, SECTION_SCSI, "Inquiry end: %d\n", ret);
-      return(ret);
+                    "chs", ((u_char *) pRequestSense)[0]);
+          for (i = 1; i < (int)sizeof(RequestSense_T); i++)
+            DebugPrint(DEBUG_ERROR, SECTION_SCSI," %02X", ((u_char *) pRequestSense)[i]);
+          DebugPrint(DEBUG_ERROR, SECTION_SCSI, "\n");
+         DebugPrint(DEBUG_ERROR, SECTION_SCSI, "Inquiry end: %d\n", ret);
+         return(ret);
+         /*NOTRACHED*/
         }
       if ( ret > 0)
         {
-          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
             {
             case SENSE_IGNORE:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Inquiry : SENSE_IGNORE\n");
               return(0);
-              break;
+              /*NOTREACHED*/
             case SENSE_RETRY:
               DebugPrint(DEBUG_INFO, SECTION_SCSI, "SCSI_Inquiry : SENSE_RETRY no %d\n", retry);
               break;
             default:
               DebugPrint(DEBUG_ERROR, SECTION_SCSI, "SCSI_Inquiry : end %d\n", pRequestSense->SenseKey);
               return(pRequestSense->SenseKey);
-              break;
+              /*NOTREACHED*/
             }
         }
       retry++;
       if (ret == 0)
         {
-          dump_hex((char *)buffer, size, DEBUG_INFO, SECTION_SCSI);
+          dump_hex((u_char *)buffer, size, DEBUG_INFO, SECTION_SCSI);
           DebugPrint(DEBUG_INFO, SECTION_SCSI, "SCSI_Inquiry : end %d\n", ret);
           return(ret);
+         /*NOTRACHED*/
         }
     }
-  
+
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_Inquiry end: %d\n", ret);
   return(ret);
 }
 
 /*
- * Read the Element Status. If DescriptorSize  != 0 then 
+ * Read the Element Status. If DescriptorSize  != 0 then
  * allocate DescriptorSize * NoOfElements for the result from the
- * Read Element Status command. 
+ * Read Element Status command.
  * If DescriptorSize == 0 than try to figure out how much space is needed
- * by 
+ * by
  * 1. do an read with an allocation size of 8
  * 2. from the result take the 'Byte Count of Descriptor Available'
  * 3. do again an Read Element Status with the result from 2.
  *
  */
-int SCSI_ReadElementStatus(int DeviceFD, 
-                           unsigned char type, 
-                           unsigned char lun,
-                           unsigned char VolTag,
-                           int StartAddress,
-                           int NoOfElements,
-                          int DescriptorSize,
-                           char **data)
+int
+SCSI_ReadElementStatus(
+    int                DeviceFD,
+    u_char     type,
+    u_char     lun,
+    u_char     VolTag,
+    int                StartAddress,
+    size_t     NoOfElements,
+    size_t     DescriptorSize,
+    u_char **  data)
 {
   CDB_T CDB;
-  int DataBufferLength;
+  size_t DataBufferLength;
   ElementStatusData_T *ElementStatusData;
   RequestSense_T *pRequestSense;
   int retry = 1;
-  int ret = -1; 
+  int ret = -1;
+
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### START SCSI_ReadElementStatus\n");
 
-  if ((pRequestSense = (RequestSense_T *)malloc(sizeof(RequestSense_T))) == NULL)
-    {
-      DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ReadElementStatus : malloc failed\n");
-      ChgExit("SCSI_ReadElementStatus","malloc failed", FATAL);
-    }
-  
+  pRequestSense = alloc(SIZEOF(RequestSense_T));
+
   /*
    * How many elements, if <= 0 than exit with an fatal error
    */
-  if (NoOfElements <= 0)
+  if (NoOfElements == 0)
     {
       ChgExit("SCSI_ReadElementStatus","No of Elements passed are le 0",FATAL);
+      /*NOTREACHED*/
     }
 
-  VolTag = (VolTag << 4) & 0x10;
-  type = type & 0xf;
-  lun = (lun << 5) & 0xe0;
-
+  VolTag = (u_char)((VolTag << 4) & 0x10);
+  type = (u_char)(type & 0xf);
+  lun = (u_char)((lun << 5) & 0xe0);
 
   /* if  DescriptorSize == 0
    * try to get the allocation length for the second call
    */
   if (DescriptorSize == 0)
     {
-      if (*data != NULL)
-       {
-         *data = realloc(*data, 8);
-       } else {
-         *data = malloc(8);
-       }
-      
+      *data = newalloc(*data, 8);
       memset(*data, 0, 8);
-      
-      
-      
+
       while (retry > 0 && retry < MAX_RETRIES)
        {
-         memset(pRequestSense, 0, sizeof(RequestSense_T) );
-         
+         memset(pRequestSense, 0, SIZEOF(RequestSense_T) );
+
          CDB[0] = SC_COM_RES;          /* READ ELEMENT STATUS */
-         CDB[1] = VolTag | type | lun; /* Element Type Code , VolTag, LUN */
+         CDB[1] = (u_char)(VolTag | type | lun); /* Element Type Code , VolTag, LUN */
          MSB2(&CDB[2], StartAddress);  /* Starting Element Address */
          MSB2(&CDB[4], NoOfElements);  /* Number Of Element */
-         CDB[6] = 0;                             /* Reserved */                          
-         MSB3(&CDB[7],8);                   /* Allocation Length */    
-         CDB[10] = 0;                           /* Reserved */                           
-         CDB[11] = 0;                           /* Control */                             
-         
-         ret = SCSI_Run(DeviceFD, Input, CDB, 12,                      
-                        *data, 8, 
-                        (char *)pRequestSense, sizeof(RequestSense_T));
-         
-         
+         CDB[6] = 0;                             /* Reserved */
+         MSB3(&CDB[7],8);                   /* Allocation Length */
+         CDB[10] = 0;                           /* Reserved */
+         CDB[11] = 0;                           /* Control */
+
+         ret = SCSI_Run(DeviceFD, Input, CDB, 12,
+                        *data, 8,
+                        pRequestSense, SIZEOF(RequestSense_T));
+
          DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ReadElementStatus : (1) SCSI_Run %d\n", ret);
          if (ret < 0)
            {
              DecodeSense(pRequestSense, "SCSI_ReadElementStatus :",debug_file);
              DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP SCSI_ReadElementStatus (%d)\n",ret);
              return(ret);
+             /*NOTRACHED*/
            }
          if ( ret > 0)
            {
-             switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+             switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
                {
                case SENSE_IGNORE:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense : SENSE_IGNORE\n");
@@ -6074,7 +6390,7 @@ int SCSI_ReadElementStatus(int DeviceFD,
                default:
                  DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense : end %d\n", pRequestSense->SenseKey);
                  return(pRequestSense->SenseKey);
-                 break;
+                 /*NOTREACHED*/
                }
            }
          retry++;
@@ -6087,51 +6403,53 @@ int SCSI_ReadElementStatus(int DeviceFD,
        {
          DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP SCSI_ReadElementStatus (%d)\n",ret);
          return(ret);
+         /*NOTRACHED*/
        }
+
       ElementStatusData = (ElementStatusData_T *)*data;
       DataBufferLength = V3(ElementStatusData->count);
 
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ReadElementStatus: DataBufferLength %X, ret %d\n",DataBufferLength, ret);
-      
+
       dump_hex(*data, 8, DEBUG_INFO, SECTION_ELEMENT);
     } else { /* DescriptorSize != 0 */
       DataBufferLength = NoOfElements * DescriptorSize;
     }
 
   DataBufferLength = DataBufferLength + 8;
-  *data = realloc(*data, DataBufferLength);
+  *data = newalloc(*data, DataBufferLength);
   memset(*data, 0, DataBufferLength);
   retry = 1;
 
   while (retry > 0 && retry < MAX_RETRIES)
     {
-      memset(pRequestSense, 0, sizeof(RequestSense_T) );
-      
+      memset(pRequestSense, 0, SIZEOF(RequestSense_T) );
+
       CDB[0] = SC_COM_RES;           /* READ ELEMENT STATUS */
-      CDB[1] = VolTag | type | lun;  /* Element Type Code, VolTag, LUN */
+      CDB[1] = (u_char)(VolTag | type | lun);  /* Element Type Code, VolTag, LUN */
       MSB2(&CDB[2], StartAddress);   /* Starting Element Address */
       MSB2(&CDB[4], NoOfElements);   /* Number Of Element */
-      CDB[6] = 0;                              /* Reserved */                      
-      MSB3(&CDB[7],DataBufferLength);  /* Allocation Length */    
-      CDB[10] = 0;                                 /* Reserved */                      
-      CDB[11] = 0;                                 /* Control */                       
-      
-      ret = SCSI_Run(DeviceFD, Input, CDB, 12,                      
-                                *data, DataBufferLength, 
-                                (char *)pRequestSense, sizeof(RequestSense_T));
-      
-      
+      CDB[6] = 0;                              /* Reserved */
+      MSB3(&CDB[7],DataBufferLength);  /* Allocation Length */
+      CDB[10] = 0;                                 /* Reserved */
+      CDB[11] = 0;                                 /* Control */
+
+      ret = SCSI_Run(DeviceFD, Input, CDB, 12,
+                                *data, DataBufferLength,
+                                pRequestSense, SIZEOF(RequestSense_T));
+
+
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ReadElementStatus : (2) SCSI_Run %d\n", ret);
       if (ret < 0)
         {
           DecodeSense(pRequestSense, "SCSI_ReadElementStatus :",debug_file);
          DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP SCSI_ReadElementStatus (%d)\n",ret);
           return(ret);
+         /*NOTRACHED*/
         }
       if ( ret > 0)
         {
-          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, (char *)pRequestSense))
+          switch(SenseHandler(DeviceFD, 0, pRequestSense->SenseKey, pRequestSense->AdditionalSenseCode, pRequestSense->AdditionalSenseCodeQualifier, pRequestSense))
             {
             case SENSE_IGNORE:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense : SENSE_IGNORE\n");
@@ -6144,7 +6462,7 @@ int SCSI_ReadElementStatus(int DeviceFD,
             default:
               DebugPrint(DEBUG_INFO, SECTION_SCSI,"SCSI_ModeSense : end %d\n", pRequestSense->SenseKey);
               return(pRequestSense->SenseKey);
-              break;
+              /*NOTREACHED*/
             }
         }
       retry++;
@@ -6158,8 +6476,9 @@ int SCSI_ReadElementStatus(int DeviceFD,
     {
       DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP SCSI_ReadElementStatus (%d)\n",ret);
       return(ret);
+      /*NOTRACHED*/
     }
+
   dump_hex(*data, DataBufferLength, DEBUG_INFO, SECTION_SCSI);
   DebugPrint(DEBUG_INFO, SECTION_SCSI,"##### STOP SCSI_ReadElementStatus (%d)\n",ret);
   return(ret);
@@ -6169,22 +6488,25 @@ printf_arglist_function2(void DebugPrint, int, level, int, section, char *, fmt)
 {
   va_list argp;
   char buf[1024];
-  extern changer_t chg;
-  int dlevel,dsection;
+  int dlevel;
+  int dsection = -1;
+  time_t ti = time(NULL);
 
-  time_t ti;
-
-  time(&ti);
-  if (chg.debuglevel)
+  if (changer->debuglevel)
     {
-      sscanf(chg.debuglevel,"%d:%d", &dlevel, &dsection);
+      if (sscanf(changer->debuglevel,"%d:%d", &dlevel, &dsection) != 2) {
+       dbprintf(("Parse error: line is '%s' expected [0-9]*:[0-9]*\n",
+                 changer->debuglevel));
+        dlevel=1;
+        dsection=1;
+      }
     } else {
       dlevel=1;
       dsection=1;
     }
 
   arglist_start(argp, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, argp);
+  vsnprintf(buf, SIZEOF(buf), fmt, argp);
   if (dlevel >= level)
     {
       if (section == dsection || dsection == 0)
@@ -6197,6 +6519,5 @@ printf_arglist_function2(void DebugPrint, int, level, int, section, char *, fmt)
          }
        }
     }
-  arglist_end(argp);  
-
+  arglist_end(argp);
 }