svn commit: samba r25822 - in branches/SAMBA_4_0/source/libcli/nbt: .

[metze at samba.org]

Author: metze
Date: 2007-11-03 10:45:59 +0000 (Sat, 03 Nov 2007)
New Revision: 25822

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25822

Log:
use NDR_CHECK()

metze

Modified:
   branches/SAMBA_4_0/source/libcli/nbt/nbtname.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/nbt/nbtname.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/nbt/nbtname.c	2007-11-03 10:20:45 UTC (rev 25821)
+++ branches/SAMBA_4_0/source/libcli/nbt/nbtname.c	2007-11-03 10:45:59 UTC (rev 25822)
@@ -96,7 +96,6 @@
 */
 _PUBLIC_ NTSTATUS ndr_pull_nbt_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
 {
-	NTSTATUS status;
 	uint32_t offset = ndr->offset;
 	uint32_t max_offset = offset;
 	unsigned num_components;
@@ -111,8 +110,7 @@
 	/* break up name into a list of components */
 	for (num_components=0;num_components<MAX_COMPONENTS;num_components++) {
 		uint8_t *component;
-		status = ndr_pull_component(ndr, &component, &offset, &max_offset);
-		NT_STATUS_NOT_OK_RETURN(status);
+		NDR_CHECK(ndr_pull_component(ndr, &component, &offset, &max_offset));
 		if (component == NULL) break;
 		if (name) {
 			name = talloc_asprintf_append_buffer(name, ".%s", component);
@@ -283,7 +281,6 @@
 */
 _PUBLIC_ NTSTATUS ndr_pull_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name *r)
 {
-	NTSTATUS status;
 	uint8_t *scope;
 	char *cname;
 	const char *s;
@@ -293,8 +290,7 @@
 		return NT_STATUS_OK;
 	}
 
-	status = ndr_pull_nbt_string(ndr, ndr_flags, &s);
-	NT_STATUS_NOT_OK_RETURN(status);
+	NDR_CHECK(ndr_pull_nbt_string(ndr, ndr_flags, &s));
 
 	scope = (uint8_t *)strchr(s, '.');
 	if (scope) {