s3-misc: Move smb_io_time() to regfio.c

This is the last file using this function and we do not want anyone
else to keep using hand marshalled stuff anyway.
So make it also private to that file.

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 99674268ed42f83b8a223fab778cb85bdf7f4a65..08d629a7545c87c8e0f4abfff263ec5512a5b33d 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -354,7 +354,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
-RPC_PARSE_OBJ1 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
+RPC_PARSE_OBJ1 = rpc_parse/parse_prs.o
 
 RPC_PARSE_OBJ2 = rpc_client/init_netlogon.o \
                 rpc_client/init_lsa.o

diff --git a/source3/include/proto.h b/source3/include/proto.h
index cb01c38a308a0818f41fc68f11079951f7d5f1c2..a9ae3d6973c791bb64c4440d40f41905a220fcaa 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5018,10 +5018,6 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
                        const struct ndr_interface_table *table,
                        uint32 opnum, void *r);
 
-/* The following definitions come from rpc_parse/parse_misc.c  */
-
-bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth);
-
 /* The following definitions come from rpc_parse/parse_prs.c  */
 
 void prs_dump(const char *name, int v, prs_struct *ps);

diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index d64eab84f9a72942b95d2fa3b0a745a61c8ab4bf..5ba936273d51734e00c87afa32b8e89977cf2334 100644 (file)
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -31,6 +31,38 @@
  *
  ******************************************************************/
 
+/*******************************************************************
+ Reads or writes an NTTIME structure.
+********************************************************************/
+
+static bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth)
+{
+       uint32 low, high;
+       if (nttime == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "smb_io_time");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if (MARSHALLING(ps)) {
+               low = *nttime & 0xFFFFFFFF;
+               high = *nttime >> 32;
+       }
+
+       if(!prs_uint32("low ", ps, depth, &low)) /* low part */
+               return False;
+       if(!prs_uint32("high", ps, depth, &high)) /* high part */
+               return False;
+
+       if (UNMARSHALLING(ps)) {
+               *nttime = (((uint64_t)high << 32) + low);
+       }
+
+       return True;
+}
 
 /*******************************************************************
 *******************************************************************/

diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
deleted file mode 100644 (file)
index 21b4e56..0000000
--- a/source3/rpc_parse/parse_misc.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997.
- *  Copyright (C) Gerald (Jerry) Carter             2005
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program 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 General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE
-
-/*******************************************************************
- Reads or writes an NTTIME structure.
-********************************************************************/
-
-bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth)
-{
-       uint32 low, high;
-       if (nttime == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "smb_io_time");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-       
-       if (MARSHALLING(ps)) {
-               low = *nttime & 0xFFFFFFFF;
-               high = *nttime >> 32;
-       }
-       
-       if(!prs_uint32("low ", ps, depth, &low)) /* low part */
-               return False;
-       if(!prs_uint32("high", ps, depth, &high)) /* high part */
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               *nttime = (((uint64_t)high << 32) + low);
-       }
-
-       return True;
-}