Remove aliasing problems in NIS code

[thirdparty/glibc.git] / nis / nis_rmdir.c

diff --git a/nis/nis_rmdir.c b/nis/nis_rmdir.c
index 5b6f1d181bbc1456959803f078ea78bb4a40277c..8c70514e069a23659b1ed765aff1655ada487d5e 100644 (file)
--- a/nis/nis_rmdir.c
+++ b/nis/nis_rmdir.c
@@ -1,46 +1,41 @@
-/* Copyright (c) 1997 Free Software Foundation, Inc.
+/* Copyright (c) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA. */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <rpcsvc/nis.h>
-#include <rpcsvc/nislib.h>
+
+#include "nis_xdr.h"
 #include "nis_intern.h"
 
 nis_error
 nis_rmdir (const_nis_name dir, const nis_server *server)
 {
-  nis_error res;
+  nis_error res, res2;
 
   if (server == NULL)
-    {
-      if (__do_niscall (NULL, 0, NIS_RMDIR, (xdrproc_t) xdr_nis_name,
-                       (caddr_t) &dir, (xdrproc_t) xdr_nis_error,
-                       (caddr_t) &res, 0) != RPC_SUCCESS)
-       return NIS_RPCERROR;
-    }
-  else
-    {
-      if (__do_niscall (server, 1, NIS_RMDIR,
-                       (xdrproc_t) xdr_nis_name,
-                       (caddr_t) &dir, (xdrproc_t) xdr_nis_error,
-                       (caddr_t) &res, 0) != RPC_SUCCESS)
-       return NIS_RPCERROR;
-    }
+    return NIS_SYSTEMERROR;
+
+  res2 = __do_niscall2 (server, 1, NIS_RMDIR,
+                       (xdrproc_t) _xdr_nis_name,
+                       (caddr_t) &dir, (xdrproc_t) _xdr_nis_error,
+                       (caddr_t) &res, 0, NULL);
+  if (res2 != NIS_SUCCESS)
+    return res2;
 
   return res;
 }