Beginning of VFM cleanup.

[pspp-builds.git] / src / file-handle.q

diff --git a/src/file-handle.q b/src/file-handle.q
index 3ff35e8e85c47db1f10925c3d57a8988521b8d91..77291a45e42836595c071150a754ab3691a0fa2d 100644 (file)
--- a/src/file-handle.q
+++ b/src/file-handle.q
@@ -122,8 +122,9 @@ cmd_file_handle (void)
       fp->recform = FH_RF_VARIABLE;
       break;
     case FH_SPANNED:
-      msg (SE, _("/RECFORM SPANNED is not implemented, as the author doesn't "
-          "know what it is supposed to do.  Send the author a note."));
+      msg (SE, 
+          _("%s is not implemented, as the author doesn't know what it is supposed to do.  Send a note to %s.") ,
+          "/RECFORM SPANNED",PACKAGE_BUGREPORT);
       break;
     default:
       assert (0);
@@ -135,18 +136,18 @@ cmd_file_handle (void)
       fp->mode = FH_MD_CHARACTER;
       break;
     case FH_IMAGE:
-      msg (SE, _("/MODE IMAGE is not implemented, as the author doesn't know "
-          "what it is supposed to do.  Send the author a note."));
+      msg (SE, 
+          _("%s is not implemented, as the author doesn't know what it is supposed to do.  Send a note to %s.") ,
+          "/MODE IMAGE",PACKAGE_BUGREPORT);
       break;
     case FH_BINARY:
       fp->mode = FH_MD_BINARY;
       break;
     case FH_MULTIPUNCH:
-      msg (SE, _("/MODE MULTIPUNCH is not implemented.  If you care, "
-                "complain."));
+      msg (SE, _("%s is not implemented.  If you care, complain."),"/MODE MULTIPUNCH");
       break;
     case FH__360:
-      msg (SE, _("/MODE 360 is not implemented.  If you care, complain."));
+      msg (SE, _("%s is not implemented.  If you care, complain."),"/MODE 360");
       break;
     default:
       assert (0);
@@ -240,7 +241,7 @@ fh_get_handle_by_name (const char name[9])
 
    Useful for printing error messages about use of file handles.  */
 const char *
-fh_handle_name (struct file_handle *h)
+fh_handle_name (const struct file_handle *h)
 {
   static char *buf = NULL;
 
@@ -285,7 +286,7 @@ fh_close_handle (struct file_handle *h)
 
 /* Hashes the name of file handle H. */
 static unsigned
-hash_file_handle (const void *handle_, void *param unused)
+hash_file_handle (const void *handle_, void *param UNUSED)
 {
   const struct file_handle *handle = handle_;
 
@@ -294,7 +295,7 @@ hash_file_handle (const void *handle_, void *param unused)
 
 /* Compares names of file handles A and B. */
 static int
-cmp_file_handle (const void *a_, const void *b_, void *foo unused)
+cmp_file_handle (const void *a_, const void *b_, void *foo UNUSED)
 {
   const struct file_handle *a = a_;
   const struct file_handle *b = b_;