X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdbserver%2Fhostio.cc;h=0185a3ba038a08a77a4739045ffa99163f021d7e;hb=4635ff975351603e64da3cbdeec3b999ee842ac8;hp=a3b32cd0fdcb4a22f0983571fb216a763c1a37ef;hpb=ea06bbaaaa975331a42f2054551e78f588020462;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdbserver/hostio.cc b/gdbserver/hostio.cc
index a3b32cd0fd..0185a3ba03 100644
--- a/gdbserver/hostio.cc
+++ b/gdbserver/hostio.cc
@@ -196,7 +196,7 @@ require_valid_fd (int fd)
 static void
 hostio_error (char *own_buf)
 {
-  the_target->pt->hostio_last_error (own_buf);
+  the_target->hostio_last_error (own_buf);
 }
 
 static void
@@ -272,9 +272,7 @@ handle_setfs (char *own_buf)
      then there's no point in GDB sending "vFile:setfs:" packets.  We
      reply with an empty packet (i.e. we pretend we don't understand
      "vFile:setfs:") and that should stop GDB sending any more.  */
-  if (the_target->multifs_open == NULL
-      && the_target->multifs_unlink == NULL
-      && the_target->multifs_readlink == NULL)
+  if (!the_target->supports_multifs ())
     {
       own_buf[0] = '\0';
       return;
@@ -321,9 +319,8 @@ handle_open (char *own_buf)
 
   /* We do not need to convert MODE, since the fileio protocol
      uses the standard values.  */
-  if (hostio_fs_pid != 0 && the_target->multifs_open != NULL)
-    fd = the_target->multifs_open (hostio_fs_pid, filename,
-				   flags, mode);
+  if (hostio_fs_pid != 0)
+    fd = the_target->multifs_open (hostio_fs_pid, filename, flags, mode);
   else
     fd = open (filename, flags, mode);
 
@@ -541,7 +538,7 @@ handle_unlink (char *own_buf)
       return;
     }
 
-  if (hostio_fs_pid != 0 && the_target->multifs_unlink != NULL)
+  if (hostio_fs_pid != 0)
     ret = the_target->multifs_unlink (hostio_fs_pid, filename);
   else
     ret = unlink (filename);
@@ -571,7 +568,7 @@ handle_readlink (char *own_buf, int *new_packet_len)
       return;
     }
 
-  if (hostio_fs_pid != 0 && the_target->multifs_readlink != NULL)
+  if (hostio_fs_pid != 0)
     ret = the_target->multifs_readlink (hostio_fs_pid, filename,
 					linkname,
 					sizeof (linkname) - 1);