The branch, master has been updated
via 4f803502ef0bca3fee5017469f858bea702b069d (commit)
via b3ba24582d251090ca4e87e2c213d8fb9cc86119 (commit)
via 00725b7c6efd73921d89a4bdb0de76d185351f90 (commit)
from d0ee90ace9e63fd83c997503a694e4c87f8a7e0f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4f803502ef0bca3fee5017469f858bea702b069d
Author: Günther Deschner <[email protected]>
Date: Thu Feb 19 17:39:36 2009 +0100
spoolss: add ndr_size_spoolss_StringArray to spoolss helper.
Guenther
commit b3ba24582d251090ca4e87e2c213d8fb9cc86119
Author: Günther Deschner <[email protected]>
Date: Thu Feb 19 17:59:51 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 00725b7c6efd73921d89a4bdb0de76d185351f90
Author: Günther Deschner <[email protected]>
Date: Thu Feb 19 17:38:47 2009 +0100
spoolss: remove gensize calculation from spoolss_StringArray. Thanks metze!
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_spoolss.c | 5 -----
librpc/gen_ndr/ndr_spoolss.h | 1 -
librpc/gen_ndr/spoolss.h | 2 +-
librpc/idl/spoolss.idl | 2 +-
librpc/ndr/ndr_spoolss_buf.c | 10 ++++++++++
librpc/ndr/ndr_spoolss_buf.h | 1 +
6 files changed, 13 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index f7f08e5..9ec3f35 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -4736,11 +4736,6 @@ _PUBLIC_ void ndr_print_spoolss_StringArray(struct
ndr_print *ndr, const char *n
ndr->depth--;
}
-_PUBLIC_ size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray
*r, struct smb_iconv_convenience *ic, int flags)
-{
- return ndr_size_struct(r, flags,
(ndr_push_flags_fn_t)ndr_push_spoolss_StringArray, ic);
-}
-
static enum ndr_err_code ndr_push_spoolss_AddDriverInfo1(struct ndr_push *ndr,
int ndr_flags, const struct spoolss_AddDriverInfo1 *r)
{
if (ndr_flags & NDR_SCALARS) {
diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index 3dc9296..f8d97c1 100644
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -255,7 +255,6 @@ void ndr_print_spoolss_SetPrinterInfoCtr(struct ndr_print
*ndr, const char *name
enum ndr_err_code ndr_push_spoolss_StringArray(struct ndr_push *ndr, int
ndr_flags, const struct spoolss_StringArray *r);
enum ndr_err_code ndr_pull_spoolss_StringArray(struct ndr_pull *ndr, int
ndr_flags, struct spoolss_StringArray *r);
void ndr_print_spoolss_StringArray(struct ndr_print *ndr, const char *name,
const struct spoolss_StringArray *r);
-size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray *r,
struct smb_iconv_convenience *ic, int flags);
void ndr_print_spoolss_AddDriverInfo1(struct ndr_print *ndr, const char *name,
const struct spoolss_AddDriverInfo1 *r);
void ndr_print_spoolss_DriverOSVersion(struct ndr_print *ndr, const char
*name, enum spoolss_DriverOSVersion r);
void ndr_print_spoolss_AddDriverInfo2(struct ndr_print *ndr, const char *name,
const struct spoolss_AddDriverInfo2 *r);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 5d858ca..2faeea2 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -547,7 +547,7 @@ struct spoolss_SetPrinterInfoCtr {
struct spoolss_StringArray {
uint32_t _ndr_size;/*
[value((ndr_size_spoolss_StringArray(r,ndr->iconv_convenience,ndr->flags)-4)/2)]
*/
const char ** string;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
-}/* [gensize,public] */;
+}/* [public] */;
struct spoolss_AddDriverInfo1 {
const char *driver_name;/* [unique,charset(UTF16)] */
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 22913f7..4bb68fa 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -619,7 +619,7 @@ import "misc.idl", "security.idl", "winreg.idl";
/******************/
/* Function: 0x09 */
- typedef [public,gensize] struct {
+ typedef [public] struct {
[value((ndr_size_spoolss_StringArray(r, ndr->iconv_convenience,
ndr->flags)-4)/2)] uint32 _ndr_size;
/*[subcontext(0),subcontext_size(_ndr_size*2)]*/ nstring_array
string;
} spoolss_StringArray;
diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c
index e74b0a9..d7e28cc 100644
--- a/librpc/ndr/ndr_spoolss_buf.c
+++ b/librpc/ndr/ndr_spoolss_buf.c
@@ -534,3 +534,13 @@ uint32_t _ndr_size_spoolss_DeviceMode(struct
spoolss_DeviceMode *devmode, struct
if (!devmode) return 0;
return ndr_size_spoolss_DeviceMode(devmode,ic,flags);
}
+
+_PUBLIC_ size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray
*r, struct smb_iconv_convenience *ic, int flags)
+{
+ if (!r) {
+ return 4;
+ }
+
+ return ndr_size_struct(r, flags,
(ndr_push_flags_fn_t)ndr_push_spoolss_StringArray, ic);
+}
+
diff --git a/librpc/ndr/ndr_spoolss_buf.h b/librpc/ndr/ndr_spoolss_buf.h
index 209ae51..8017376 100644
--- a/librpc/ndr/ndr_spoolss_buf.h
+++ b/librpc/ndr/ndr_spoolss_buf.h
@@ -38,6 +38,7 @@ enum ndr_err_code ndr_push_spoolss_GetPrinterData(struct
ndr_push *ndr, int flag
enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int
flags, struct spoolss_GetPrinterData *r);
enum ndr_err_code ndr_push_spoolss_SetPrinterData(struct ndr_push *ndr, int
flags, const struct spoolss_SetPrinterData *r);
uint32_t _ndr_size_spoolss_DeviceMode(struct spoolss_DeviceMode *devmode,
struct smb_iconv_convenience *ic, uint32_t flags);
+size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray *r,
struct smb_iconv_convenience *ic, int flags);
#undef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2)
--
Samba Shared Repository
