diff options
| author | Günther Deschner <gd@samba.org> | 2010-04-30 01:19:20 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-04-30 01:25:01 +0200 |
| commit | 1cb7b8ded66e0f9a7204b850ca2132d1392dfc6e (patch) | |
| tree | 484ecc5fd444347a872e08daeab9a63a18d24c08 /librpc/gen_ndr | |
| parent | 4fc3aefc518af94de8c985ad177ff70c5df229ad (diff) | |
| download | samba-1cb7b8ded66e0f9a7204b850ca2132d1392dfc6e.tar.gz | |
s3: re-run make samba3-idl.
Guenther
Diffstat (limited to 'librpc/gen_ndr')
| -rw-r--r-- | librpc/gen_ndr/ndr_rap.c | 12 | ||||
| -rw-r--r-- | librpc/gen_ndr/rap.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/librpc/gen_ndr/ndr_rap.c b/librpc/gen_ndr/ndr_rap.c index 1488b34a4c5..05d38b2fb4a 100644 --- a/librpc/gen_ndr/ndr_rap.c +++ b/librpc/gen_ndr/ndr_rap.c @@ -767,7 +767,7 @@ static enum ndr_err_code ndr_push_rap_PrintQueue0(struct ndr_push *ndr, int ndr_ { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 1)); - NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->PrintQName, 13)); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->PrintQName, 13, sizeof(uint8_t), CH_DOS)); NDR_CHECK(ndr_push_trailer_align(ndr, 1)); } if (ndr_flags & NDR_BUFFERS) { @@ -779,7 +779,7 @@ static enum ndr_err_code ndr_pull_rap_PrintQueue0(struct ndr_pull *ndr, int ndr_ { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 1)); - NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->PrintQName, 13)); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->PrintQName, 13, sizeof(uint8_t), CH_DOS)); NDR_CHECK(ndr_pull_trailer_align(ndr, 1)); } if (ndr_flags & NDR_BUFFERS) { @@ -791,7 +791,7 @@ _PUBLIC_ void ndr_print_rap_PrintQueue0(struct ndr_print *ndr, const char *name, { ndr_print_struct(ndr, name, "rap_PrintQueue0"); ndr->depth++; - ndr_print_array_uint8(ndr, "PrintQName", r->PrintQName, 13); + ndr_print_string(ndr, "PrintQName", r->PrintQName); ndr->depth--; } @@ -799,7 +799,7 @@ static enum ndr_err_code ndr_push_rap_PrintQueue1(struct ndr_push *ndr, int ndr_ { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 5)); - NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->PrintQName, 13)); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->PrintQName, 13, sizeof(uint8_t), CH_DOS)); NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->Pad1)); NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->Priority)); NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->StartTime)); @@ -872,7 +872,7 @@ static enum ndr_err_code ndr_pull_rap_PrintQueue1(struct ndr_pull *ndr, int ndr_ TALLOC_CTX *_mem_save_CommentString_0; if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 5)); - NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->PrintQName, 13)); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->PrintQName, 13, sizeof(uint8_t), CH_DOS)); NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->Pad1)); NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Priority)); NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->StartTime)); @@ -1005,7 +1005,7 @@ _PUBLIC_ void ndr_print_rap_PrintQueue1(struct ndr_print *ndr, const char *name, { ndr_print_struct(ndr, name, "rap_PrintQueue1"); ndr->depth++; - ndr_print_array_uint8(ndr, "PrintQName", r->PrintQName, 13); + ndr_print_string(ndr, "PrintQName", r->PrintQName); ndr_print_uint8(ndr, "Pad1", r->Pad1); ndr_print_uint16(ndr, "Priority", r->Priority); ndr_print_uint16(ndr, "StartTime", r->StartTime); diff --git a/librpc/gen_ndr/rap.h b/librpc/gen_ndr/rap.h index b209fd4af6f..fa9b2c695d1 100644 --- a/librpc/gen_ndr/rap.h +++ b/librpc/gen_ndr/rap.h @@ -520,11 +520,11 @@ enum rap_PrintQStatusCode ; struct rap_PrintQueue0 { - uint8_t PrintQName[13]; + const char *PrintQName;/* [charset(DOS)] */ }; struct rap_PrintQueue1 { - uint8_t PrintQName[13]; + const char *PrintQName;/* [charset(DOS)] */ uint8_t Pad1; uint16_t Priority; uint16_t StartTime; |