Imported Upstream version 2.6.0

[debian/amanda] / changer-src / scsi-hpux_new.c

diff --git a/changer-src/scsi-hpux_new.c b/changer-src/scsi-hpux_new.c
index e96ed4725b9347831a98bede862b10792a9896dc..288bff28d30a171cf72f0b050feda76d31dd6b26 100644 (file)
--- a/changer-src/scsi-hpux_new.c
+++ b/changer-src/scsi-hpux_new.c
@@ -32,23 +32,7 @@
  */
 
 
-#include <amanda.h>
-
-#ifdef HAVE_HPUX_LIKE_SCSI
-
-# ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-/*
-#ifdef HAVE_STDIO_H
-*/
-#include <stdio.h>
-/*
-#endif
-*/
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
+#include "amanda.h"
 
 #include <sys/scsi.h>
 #include <sys/mtio.h>
@@ -190,9 +174,9 @@ int SCSI_ExecuteCommand(int DeviceFD,
       {
         if (SCSI_OpenDevice(DeviceFD) == 0)
           {
-            dbprintf(("SCSI_ExecuteCommand could not open %s: %s\n",
+            dbprintf(_("SCSI_ExecuteCommand could not open %s: %s\n"),
                       pDev[DeviceFD].dev,
-                     strerror(errno)));
+                     strerror(errno));
             sleep(1); /* Give device a little time befor retry */
             continue;
           }
@@ -251,7 +235,7 @@ int Tape_Ioctl( int DeviceFD, int command)
 
   if (ioctl(pDev[DeviceFD].fd , MTIOCTOP, &mtop) != 0)
     {
-      dbprintf(("Tape_Ioctl error ioctl %s\n", strerror(errno)));
+      dbprintf(_("Tape_Ioctl error ioctl %s\n"), strerror(errno));
       SCSI_CloseDevice(DeviceFD);
       return(-1);
     }
@@ -274,12 +258,12 @@ int Tape_Status( int DeviceFD)
 
   if (ioctl(pDev[DeviceFD].fd, MTIOCGET, &mtget) != 0)
   {
-     dbprintf(("Tape_Status error ioctl %s\n", strerror(errno)));
+     dbprintf(_("Tape_Status error ioctl %s\n"), strerror(errno));
      SCSI_CloseDevice(DeviceFD);
      return(-1);
   }
 
-  dbprintf(("ioctl -> mtget.mt_gstat %X\n",mtget.mt_gstat));
+  dbprintf(_("ioctl -> mtget.mt_gstat %X\n"),mtget.mt_gstat);
   if (GMT_ONLINE(mtget.mt_gstat))
   {
     ret = TAPE_ONLINE;
@@ -311,7 +295,6 @@ int ScanBus(int print)
 */
   return(-1);
 }
-#endif
 /*
  * Local variables:
  * indent-tabs-mode: nil