Fix compile time warning messages.

[deliverable/binutils-gdb.git] / sim / common / callback.c

diff --git a/sim/common/callback.c b/sim/common/callback.c
index 068cea292e9ab44ee9017b0ff9a8c5d9bef85d50..19acca0e99889a7a3281a8521375b03f68f823fe 100644 (file)
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -89,7 +89,6 @@ static void os_error PARAMS ((host_callback *, const char *, ...));
 static int fdmap PARAMS ((host_callback *, int));
 static int fdbad PARAMS ((host_callback *, int));
 static int wrap PARAMS ((host_callback *, int));
-static int enosys PARAMS ((host_callback *, int));
 
 /* Set the callback copy of errno from what we see now.  */
 
@@ -102,21 +101,6 @@ wrap (p, val)
   return val;
 }
 
-/* Return a value indicating the system call isn't present.  */
-
-static int
-enosys (p, result)
-     host_callback *p;
-     int result;
-{
-#ifdef ENOSYS
-  p->last_errno = ENOSYS;
-#else
-  p->last_errno = EINVAL;
-#endif
-  return result;
-}
-
 /* Make sure the FD provided is ok.  If not, return non-zero
    and set errno. */
 
@@ -152,7 +136,7 @@ os_close (p, fd)
   if (result)
     return result;
   result = wrap (p, close (fdmap (p, fd)));
-  if(result == 0 && !p->alwaysopen[fd])
+  if (result == 0 && !p->alwaysopen[fd])
     p->fdopen[fd] = 0;
 
   return result;
@@ -322,32 +306,32 @@ os_write (p, fd, buf, len)
 
 static int 
 os_write_stdout (p, buf, len)
-     host_callback *p;
+     host_callback *p ATTRIBUTE_UNUSED;
      const char *buf;
      int len;
 {
-  return fwrite(buf, 1, len, stdout);
+  return fwrite (buf, 1, len, stdout);
 }
 
 static void
 os_flush_stdout (p)
-     host_callback *p;
+     host_callback *p ATTRIBUTE_UNUSED;
 {
   fflush (stdout);
 }
 
 static int 
 os_write_stderr (p, buf, len)
-     host_callback *p;
+     host_callback *p ATTRIBUTE_UNUSED;
      const char *buf;
      int len;
 {
-  return fwrite(buf, 1, len, stderr);
+  return fwrite (buf, 1, len, stderr);
 }
 
 static void
 os_flush_stderr (p)
-     host_callback *p;
+     host_callback *p ATTRIBUTE_UNUSED;
 {
   fflush (stderr);
 }
@@ -391,8 +375,12 @@ static int
 os_stat (p, file, buf)
      host_callback *p;
      const char *file;
-     PTR buf;
+     struct stat *buf;
 {
+  /* ??? There is an issue of when to translate to the target layout.
+     One could do that inside this function, or one could have the
+     caller do it.  It's more flexible to let the caller do it, though
+     I'm not sure the flexibility will ever be useful.  */
   return wrap (p, stat (file, buf));
 }
 
@@ -400,9 +388,15 @@ static int
 os_fstat (p, fd, buf)
      host_callback *p;
      int fd;
-     PTR buf;
+     struct stat *buf;
 {
-  return wrap (p, fstat (fd, buf));
+  if (fdbad (p, fd))
+    return -1;
+  /* ??? There is an issue of when to translate to the target layout.
+     One could do that inside this function, or one could have the
+     caller do it.  It's more flexible to let the caller do it, though
+     I'm not sure the flexibility will ever be useful.  */
+  return wrap (p, fstat (fdmap (p, fd), buf));
 }
 
 static int
@@ -446,7 +440,7 @@ os_init (p)
 /* VARARGS */
 static void
 #ifdef ANSI_PROTOTYPES
-os_printf_filtered (host_callback *p, const char *format, ...)
+os_printf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
 #else
 os_printf_filtered (p, va_alist)
      host_callback *p;
@@ -470,7 +464,7 @@ os_printf_filtered (p, va_alist)
 /* VARARGS */
 static void
 #ifdef ANSI_PROTOTYPES
-os_vprintf_filtered (host_callback *p, const char *format, va_list args)
+os_vprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args)
 #else
 os_vprintf_filtered (p, format, args)
      host_callback *p;
@@ -484,7 +478,7 @@ os_vprintf_filtered (p, format, args)
 /* VARARGS */
 static void
 #ifdef ANSI_PROTOTYPES
-os_evprintf_filtered (host_callback *p, const char *format, va_list args)
+os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args)
 #else
 os_evprintf_filtered (p, format, args)
      host_callback *p;
@@ -498,7 +492,7 @@ os_evprintf_filtered (p, format, args)
 /* VARARGS */
 static void
 #ifdef ANSI_PROTOTYPES
-os_error (host_callback *p, const char *format, ...)
+os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
 #else
 os_error (p, va_alist)
      host_callback *p;
@@ -728,20 +722,25 @@ store (p, size, val, big_p)
 }
 
 /* Translate a host's stat struct into a target's.
+   If HS is NULL, just compute the length of the buffer required,
+   TS is ignored.
 
-   BIG_P is non-zero if the target is big-endian.
    The result is the size of the target's stat struct,
    or zero if an error occured during the translation.  */
 
 int
-cb_host_to_target_stat (cb, hs, ts, big_p)
+cb_host_to_target_stat (cb, hs, ts)
      host_callback *cb;
      const struct stat *hs;
      PTR ts;
-     int big_p;
 {
   const char *m = cb->stat_map;
-  char *p = ts;
+  char *p;
+  int big_p = 0;
+
+  if (hs == NULL)
+    ts = NULL;
+  p = ts;
 
   while (m)
     {
@@ -761,13 +760,16 @@ cb_host_to_target_stat (cb, hs, ts, big_p)
          return 0;
        }
 
-      if (strncmp (m, "st_dev", q - m) == 0)
-       store (p, size, hs->st_dev, big_p);
-      else if (strncmp (m, "st_ino", q - m) == 0)
-       store (p, size, hs->st_ino, big_p);
-      /* FIXME:wip */
-      else
-       store (p, size, 0, big_p); /* unsupported field, store 0 */
+      if (hs != NULL)
+       {
+         if (strncmp (m, "st_dev", q - m) == 0)
+           store (p, size, hs->st_dev, big_p);
+         else if (strncmp (m, "st_ino", q - m) == 0)
+           store (p, size, hs->st_ino, big_p);
+         /* FIXME:wip */
+         else
+           store (p, size, 0, big_p); /* unsupported field, store 0 */
+       }
 
       p += size;
       m = strchr (q, ':');