From 7277668128e3a8c138e9dc48ce6c2e85d1aac34f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 19 Apr 2010 11:45:33 +0200 Subject: spoolss: move up enum spoolss_Build in the IDL. Guenther --- librpc/gen_ndr/ndr_spoolss.c | 50 ++++++++++++++++++++++---------------------- librpc/gen_ndr/ndr_spoolss.h | 2 +- librpc/gen_ndr/spoolss.h | 26 +++++++++++------------ 3 files changed, 39 insertions(+), 39 deletions(-) (limited to 'librpc/gen_ndr') diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index a2355b7941..552f894947 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -308,6 +308,31 @@ _PUBLIC_ void ndr_print_spoolss_JobStatus(struct ndr_print *ndr, const char *nam ndr->depth--; } +static enum ndr_err_code ndr_push_spoolss_Build(struct ndr_push *ndr, int ndr_flags, enum spoolss_Build r) +{ + NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r)); + return NDR_ERR_SUCCESS; +} + +static enum ndr_err_code ndr_pull_spoolss_Build(struct ndr_pull *ndr, int ndr_flags, enum spoolss_Build *r) +{ + uint32_t v; + NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v)); + *r = v; + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ void ndr_print_spoolss_Build(struct ndr_print *ndr, const char *name, enum spoolss_Build r) +{ + const char *val = NULL; + + switch (r) { + case SPOOLSS_DEBUGGING_BUILD: val = "SPOOLSS_DEBUGGING_BUILD"; break; + case SPOOLSS_RELEASE_BUILD: val = "SPOOLSS_RELEASE_BUILD"; break; + } + ndr_print_enum(ndr, name, "ENUM", val, r); +} + _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo0 *r) { if (ndr_flags & NDR_SCALARS) { @@ -6810,31 +6835,6 @@ _PUBLIC_ void ndr_print_spoolss_PrinterControl(struct ndr_print *ndr, const char ndr_print_enum(ndr, name, "ENUM", val, r); } -static enum ndr_err_code ndr_push_spoolss_Build(struct ndr_push *ndr, int ndr_flags, enum spoolss_Build r) -{ - NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r)); - return NDR_ERR_SUCCESS; -} - -static enum ndr_err_code ndr_pull_spoolss_Build(struct ndr_pull *ndr, int ndr_flags, enum spoolss_Build *r) -{ - uint32_t v; - NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v)); - *r = v; - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_spoolss_Build(struct ndr_print *ndr, const char *name, enum spoolss_Build r) -{ - const char *val = NULL; - - switch (r) { - case SPOOLSS_DEBUGGING_BUILD: val = "SPOOLSS_DEBUGGING_BUILD"; break; - case SPOOLSS_RELEASE_BUILD: val = "SPOOLSS_RELEASE_BUILD"; break; - } - ndr_print_enum(ndr, name, "ENUM", val, r); -} - static enum ndr_err_code ndr_push_spoolss_SetPrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_SetPrinterInfo0 *r) { if (ndr_flags & NDR_SCALARS) { diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h index 2ae3466077..2f4411e1a9 100644 --- a/librpc/gen_ndr/ndr_spoolss.h +++ b/librpc/gen_ndr/ndr_spoolss.h @@ -243,6 +243,7 @@ enum ndr_err_code ndr_push_spoolss_PrinterStatus(struct ndr_push *ndr, int ndr_f enum ndr_err_code ndr_pull_spoolss_PrinterStatus(struct ndr_pull *ndr, int ndr_flags, uint32_t *r); void ndr_print_spoolss_PrinterStatus(struct ndr_print *ndr, const char *name, uint32_t r); void ndr_print_spoolss_JobStatus(struct ndr_print *ndr, const char *name, uint32_t r); +void ndr_print_spoolss_Build(struct ndr_print *ndr, const char *name, enum spoolss_Build r); enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo0 *r); enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo0 *r); void ndr_print_spoolss_PrinterInfo0(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo0 *r); @@ -347,7 +348,6 @@ void ndr_print_spoolss_SetJobInfo(struct ndr_print *ndr, const char *name, const void ndr_print_spoolss_JobInfoContainer(struct ndr_print *ndr, const char *name, const struct spoolss_JobInfoContainer *r); void ndr_print_spoolss_JobControl(struct ndr_print *ndr, const char *name, enum spoolss_JobControl r); void ndr_print_spoolss_PrinterControl(struct ndr_print *ndr, const char *name, enum spoolss_PrinterControl r); -void ndr_print_spoolss_Build(struct ndr_print *ndr, const char *name, enum spoolss_Build r); void ndr_print_spoolss_SetPrinterInfo0(struct ndr_print *ndr, const char *name, const struct spoolss_SetPrinterInfo0 *r); void ndr_print_spoolss_SetPrinterInfo1(struct ndr_print *ndr, const char *name, const struct spoolss_SetPrinterInfo1 *r); void ndr_print_spoolss_SetPrinterInfo2(struct ndr_print *ndr, const char *name, const struct spoolss_SetPrinterInfo2 *r); diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h index f1f0c4f002..9d6fb6dd82 100644 --- a/librpc/gen_ndr/spoolss.h +++ b/librpc/gen_ndr/spoolss.h @@ -243,6 +243,19 @@ enum spoolss_MinorVersion #define JOB_STATUS_RESTART ( 0x00000800 ) #define JOB_STATUS_COMPLETE ( 0x00001000 ) +enum spoolss_Build +#ifndef USE_UINT_ENUMS + { + SPOOLSS_DEBUGGING_BUILD=(int)(0x00000000), + SPOOLSS_RELEASE_BUILD=(int)(0x00000001) +} +#else + { __donnot_use_enum_spoolss_Build=0x7FFFFFFF} +#define SPOOLSS_DEBUGGING_BUILD ( 0x00000000 ) +#define SPOOLSS_RELEASE_BUILD ( 0x00000001 ) +#endif +; + struct spoolss_PrinterInfo0 { const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ @@ -1467,19 +1480,6 @@ enum spoolss_PrinterControl #endif ; -enum spoolss_Build -#ifndef USE_UINT_ENUMS - { - SPOOLSS_DEBUGGING_BUILD=(int)(0x00000000), - SPOOLSS_RELEASE_BUILD=(int)(0x00000001) -} -#else - { __donnot_use_enum_spoolss_Build=0x7FFFFFFF} -#define SPOOLSS_DEBUGGING_BUILD ( 0x00000000 ) -#define SPOOLSS_RELEASE_BUILD ( 0x00000001 ) -#endif -; - struct spoolss_SetPrinterInfo0 { const char *servername;/* [unique,charset(UTF16)] */ const char *printername;/* [unique,charset(UTF16)] */ -- cgit