[VCDImager Bugs/Devel] vcd_mmc_linux.c on non-linux system

[Steven M. Schultz]

Greetings --

        The non-linux case in vcd_mmc_linux.c needs some attention ;)

        I moved the '#include <libvcd/vcd_assert.h> up a few lines so that
        the macros in that file are available in the '!linux' sections.

        Then in the "!defined(__linux__)" block a few minor changes so that
        the compiler would stop complaining.

        Output from "diff -u" is appended below for your reading pleasure ;)

        Steven Schultz
        address@hidden

-----------------------cut here----------------
--- vcd_mmc_linux.c.dist        Thu Sep 20 13:03:52 2001
+++ vcd_mmc_linux.c     Mon Oct  1 16:10:55 2001
@@ -25,11 +25,11 @@
 
 #include <libvcd/vcd_mmc_linux.h>
 #include <libvcd/vcd_logging.h>
+#include <libvcd/vcd_assert.h>
 
 #if defined(__linux__)
 
 #include <libvcd/vcd_util.h>
-#include <libvcd/vcd_assert.h>
 
 #include <string.h>
 #include <stdio.h>
@@ -193,8 +193,7 @@
 #else /* !defined (__linux__) */
 
 int
-_vcd_mmc_linux_generic_packet (void *device,
-                              _vcd_mmc_command_t * cmd, int timeout)
+_vcd_mmc_linux_generic_packet (void *device, _vcd_mmc_command_t * cmd)
 {
   vcd_error ("Tried to access linux packed interface on non-linux system.\n");
   vcd_assert_not_reached ();
@@ -204,14 +203,18 @@
 void *
 _vcd_mmc_linux_new_device (const char *device)
 {
-  vcd_log ("Generic packet interface only supported on linux.\n");
+  const char msg[] = "Generic packet interface only supported on linux.\n";
+
+  vcd_log (LOG_ERROR, msg);
   return NULL;
 }
 
 void
 _vcd_mmc_linux_destroy_device (void *user_data)
 {
-  vcd_error ("Tried to access linux packed interface on non-linux system.\n");
+  const char msg[] = "Tried to access linux packed interface on non-linux 
system.\n";
+
+  vcd_error (msg);
   vcd_assert_not_reached ();
 }