[PATCH] fix cid 1311245
Michael Adam
obnox at samba.org
Tue Jul 7 07:52:35 UTC 2015
Two add-on patches to move variables into scope
and reduce irritating indentation.
Cheers - Michael
On 2015-07-07 at 08:55 +0200, Michael Adam wrote:
> review appreciated
>
> Thanks - Michael
-------------- next part --------------
From 31393f5975b9e5537a0ffc7fe5b14940ca921676 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 7 Jul 2015 09:47:51 +0200
Subject: [PATCH 1/2] librpc:ndr:witness: move variables into scope
Signed-off-by: Michael Adam <obnox at samba.org>
---
librpc/ndr/ndr_witness.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/librpc/ndr/ndr_witness.c b/librpc/ndr/ndr_witness.c
index 797284b..cbc98bb 100644
--- a/librpc/ndr/ndr_witness.c
+++ b/librpc/ndr/ndr_witness.c
@@ -60,9 +60,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_witness_notifyResponse(struct ndr_push *ndr,
_PUBLIC_ enum ndr_err_code ndr_pull_witness_notifyResponse(struct ndr_pull *ndr, int ndr_flags, struct witness_notifyResponse *r)
{
- uint32_t size_messages_0 = 0;
- uint32_t cntr_messages_0;
- TALLOC_CTX *_mem_save_messages_0;
{
uint32_t _flags_save_STRUCT = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
@@ -83,6 +80,10 @@ _PUBLIC_ enum ndr_err_code ndr_pull_witness_notifyResponse(struct ndr_pull *ndr,
r->messages = NULL;
}
if (r->messages) {
+ uint32_t size_messages_0 = 0;
+ uint32_t cntr_messages_0;
+ TALLOC_CTX *_mem_save_messages_0;
+
size_messages_0 = r->num;
NDR_PULL_ALLOC_N(ndr, r->messages, size_messages_0);
_mem_save_messages_0 = NDR_PULL_GET_MEM_CTX(ndr);
--
2.4.3
From b0d63352d29ca13b2e3ae1907b4e319ce82de36e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 7 Jul 2015 09:50:21 +0200
Subject: [PATCH 2/2] librpc:ndr:witness: remove an unneeded block, reducing
indentation.
Check with "git diff -w".
Signed-off-by: Michael Adam <obnox at samba.org>
---
librpc/ndr/ndr_witness.c | 81 ++++++++++++++++++++++++------------------------
1 file changed, 40 insertions(+), 41 deletions(-)
diff --git a/librpc/ndr/ndr_witness.c b/librpc/ndr/ndr_witness.c
index cbc98bb..288e640 100644
--- a/librpc/ndr/ndr_witness.c
+++ b/librpc/ndr/ndr_witness.c
@@ -60,52 +60,51 @@ _PUBLIC_ enum ndr_err_code ndr_push_witness_notifyResponse(struct ndr_push *ndr,
_PUBLIC_ enum ndr_err_code ndr_pull_witness_notifyResponse(struct ndr_pull *ndr, int ndr_flags, struct witness_notifyResponse *r)
{
- {
- uint32_t _flags_save_STRUCT = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
- NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
- if (ndr_flags & NDR_SCALARS) {
- NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_witness_notifyResponse_type(ndr, NDR_SCALARS, &r->type));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num));
- {
- uint32_t _flags_save_witness_notifyResponse_message = ndr->flags;
- uint32_t _ptr_messages;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_messages));
- if (_ptr_messages) {
- NDR_PULL_ALLOC(ndr, r->messages);
- } else {
- r->messages = NULL;
- }
- if (r->messages) {
- uint32_t size_messages_0 = 0;
- uint32_t cntr_messages_0;
- TALLOC_CTX *_mem_save_messages_0;
+ uint32_t _flags_save_STRUCT = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
+ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_witness_notifyResponse_type(ndr, NDR_SCALARS, &r->type));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num));
+ {
+ uint32_t _flags_save_witness_notifyResponse_message = ndr->flags;
+ uint32_t _ptr_messages;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_messages));
+ if (_ptr_messages) {
+ NDR_PULL_ALLOC(ndr, r->messages);
+ } else {
+ r->messages = NULL;
+ }
+ if (r->messages) {
+ uint32_t size_messages_0 = 0;
+ uint32_t cntr_messages_0;
+ TALLOC_CTX *_mem_save_messages_0;
- size_messages_0 = r->num;
- NDR_PULL_ALLOC_N(ndr, r->messages, size_messages_0);
- _mem_save_messages_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->messages, 0);
- {
- struct ndr_pull *_ndr_messages;
- NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_messages, 4, r->length));
- for (cntr_messages_0 = 0; cntr_messages_0 < (size_messages_0); cntr_messages_0++) {
- NDR_CHECK(ndr_pull_set_switch_value(_ndr_messages, &r->messages[cntr_messages_0], r->type));
- NDR_CHECK(ndr_pull_witness_notifyResponse_message(_ndr_messages, NDR_SCALARS, &r->messages[cntr_messages_0]));
- }
- NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_messages, 4, r->length));
+ size_messages_0 = r->num;
+ NDR_PULL_ALLOC_N(ndr, r->messages, size_messages_0);
+ _mem_save_messages_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->messages, 0);
+ {
+ struct ndr_pull *_ndr_messages;
+ NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_messages, 4, r->length));
+ for (cntr_messages_0 = 0; cntr_messages_0 < (size_messages_0); cntr_messages_0++) {
+ NDR_CHECK(ndr_pull_set_switch_value(_ndr_messages, &r->messages[cntr_messages_0], r->type));
+ NDR_CHECK(ndr_pull_witness_notifyResponse_message(_ndr_messages, NDR_SCALARS, &r->messages[cntr_messages_0]));
}
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_messages_0, 0);
+ NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_messages, 4, r->length));
}
- ndr->flags = _flags_save_witness_notifyResponse_message;
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_messages_0, 0);
}
- NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
- }
- if (ndr_flags & NDR_BUFFERS) {
+ ndr->flags = _flags_save_witness_notifyResponse_message;
}
- ndr->flags = _flags_save_STRUCT;
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
}
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ ndr->flags = _flags_save_STRUCT;
+
return NDR_ERR_SUCCESS;
}
--
2.4.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150707/f3e5c9dc/attachment.pgp>
More information about the samba-technical
mailing list