summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-17 14:45:24 +0100
committerGünther Deschner <gd@samba.org>2009-03-17 18:39:23 +0100
commitd759f9961a30c5dc9920f620b783ffa58daf9b03 (patch)
treee59f20091ffb950dea6b68bab73b00cc347a3e98 /source3/include
parent47c024fd7516aa940b6b04f903cedff677e5543e (diff)
downloadsamba-d759f9961a30c5dc9920f620b783ffa58daf9b03.tar.gz
samba-d759f9961a30c5dc9920f620b783ffa58daf9b03.tar.bz2
samba-d759f9961a30c5dc9920f620b783ffa58daf9b03.zip
s3-spoolss: move SYSTEMTIME parsing to a more generic place, as suggested.
Guenther
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/include/rpc_misc.h19
-rw-r--r--source3/include/rpc_spoolss.h19
3 files changed, 21 insertions, 21 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ddc6ed1fad..fea9588775 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5677,6 +5677,8 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth);
bool smb_io_nttime(const char *desc, prs_struct *ps, int depth, NTTIME *nttime);
+bool smb_io_system_time(const char *desc, prs_struct *ps, int depth, SYSTEMTIME *systime);
+bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
bool smb_io_dom_sid(const char *desc, DOM_SID *sid, prs_struct *ps, int depth);
bool smb_io_uuid(const char *desc, struct GUID *uuid,
prs_struct *ps, int depth);
@@ -5826,8 +5828,6 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int
/* The following definitions come from rpc_parse/parse_spoolss.c */
-bool spoolss_io_system_time(const char *desc, prs_struct *ps, int depth, SYSTEMTIME *systime);
-bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
bool spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, DEVICEMODE *devmode);
uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, uint16 *src);
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 1e9d43bfa0..37dffbb005 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -138,4 +138,23 @@ typedef struct { /* UNISTR3 - XXXX not sure about this structure */
UNISTR str;
} UNISTR3;
+/*
+ * I'm really wondering how many different time formats
+ * I will have to cope with
+ *
+ * JFM, 09/13/98 In a mad mood ;-(
+*/
+typedef struct systemtime
+{
+ uint16 year;
+ uint16 month;
+ uint16 dayofweek;
+ uint16 day;
+ uint16 hour;
+ uint16 minute;
+ uint16 second;
+ uint16 milliseconds;
+}
+SYSTEMTIME;
+
#endif /* _RPC_MISC_H */
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 0d98afba25..29f505ab59 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -233,25 +233,6 @@ typedef struct devicemode
}
DEVICEMODE;
-/*
- * I'm really wondering how many different time formats
- * I will have to cope with
- *
- * JFM, 09/13/98 In a mad mood ;-(
-*/
-typedef struct systemtime
-{
- uint16 year;
- uint16 month;
- uint16 dayofweek;
- uint16 day;
- uint16 hour;
- uint16 minute;
- uint16 second;
- uint16 milliseconds;
-}
-SYSTEMTIME;
-
/********************************************/
typedef struct printer_enum_values