svn commit: samba r25533 - in branches: SAMBA_3_2/source/libsmb SAMBA_3_2/source/torture SAMBA_3_2_0/source/libsmb SAMBA_3_2_0/source/torture

[vlendec at samba.org]

Author: vlendec
Date: 2007-10-05 21:28:54 +0000 (Fri, 05 Oct 2007)
New Revision: 25533

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

Log:
remove a pstring
Modified:
   branches/SAMBA_3_2/source/libsmb/nterr.c
   branches/SAMBA_3_2/source/torture/torture.c
   branches/SAMBA_3_2_0/source/libsmb/nterr.c
   branches/SAMBA_3_2_0/source/torture/torture.c


Changeset:
Modified: branches/SAMBA_3_2/source/libsmb/nterr.c
===================================================================
--- branches/SAMBA_3_2/source/libsmb/nterr.c	2007-10-05 21:22:07 UTC (rev 25532)
+++ branches/SAMBA_3_2/source/libsmb/nterr.c	2007-10-05 21:28:54 UTC (rev 25533)
@@ -647,7 +647,6 @@
 
 const char *nt_errstr(NTSTATUS nt_code)
 {
-        static pstring msg;
         int idx = 0;
 
 #ifdef HAVE_LDAP
@@ -656,8 +655,6 @@
 	}
 #endif
 
-	slprintf(msg, sizeof(msg), "NT code 0x%08x", NT_STATUS_V(nt_code));
-
 	while (nt_errs[idx].nt_errstr != NULL) {
 		if (NT_STATUS_EQUAL(nt_errs[idx].nt_errcode, nt_code)) {
                         return nt_errs[idx].nt_errstr;
@@ -665,7 +662,8 @@
 		idx++;
 	}
 
-        return msg;
+	return talloc_asprintf(talloc_tos(), "NT code 0x%08x",
+			       NT_STATUS_V(nt_code));
 }
 
 /************************************************************************
@@ -689,28 +687,6 @@
 }
 
 /*****************************************************************************
- Returns an NT_STATUS constant as a string for inclusion in autogen C code.
- *****************************************************************************/
-
-const char *get_nt_error_c_code(NTSTATUS nt_code)
-{
-        static pstring out;
-        int idx = 0;
-
-	while (nt_errs[idx].nt_errstr != NULL) {
-		if (NT_STATUS_V(nt_errs[idx].nt_errcode) == 
-                    NT_STATUS_V(nt_code)) {
-                        return nt_errs[idx].nt_errstr;
-		}
-		idx++;
-	}
-
-	slprintf(out, sizeof(out), "NT_STATUS(0x%08x)", NT_STATUS_V(nt_code));
-
-        return out;
-}
-
-/*****************************************************************************
  Returns the NT_STATUS constant matching the string supplied (as an NTSTATUS)
  *****************************************************************************/
 

Modified: branches/SAMBA_3_2/source/torture/torture.c
===================================================================
--- branches/SAMBA_3_2/source/torture/torture.c	2007-10-05 21:22:07 UTC (rev 25532)
+++ branches/SAMBA_3_2/source/torture/torture.c	2007-10-05 21:28:54 UTC (rev 25533)
@@ -4768,14 +4768,14 @@
 
 		if (NT_STATUS_V(nt_status) != error) { 
 			printf("/*\t{ This NT error code was 'sqashed'\n\t from %s to %s \n\t during the session setup }\n*/\n", 
-			       get_nt_error_c_code(NT_STATUS(error)), 
-			       get_nt_error_c_code(nt_status));
+			       nt_errstr(NT_STATUS(error)),
+			       nt_errstr(nt_status));
 		}
 		
 		printf("\t{%s,\t%s,\t%s},\n", 
 		       smb_dos_err_class(errclass), 
 		       smb_dos_err_name(errclass, errnum), 
-		       get_nt_error_c_code(NT_STATUS(error)));
+		       nt_errstr(NT_STATUS(error)));
 	}
 	return True;
 }

Modified: branches/SAMBA_3_2_0/source/libsmb/nterr.c
===================================================================
--- branches/SAMBA_3_2_0/source/libsmb/nterr.c	2007-10-05 21:22:07 UTC (rev 25532)
+++ branches/SAMBA_3_2_0/source/libsmb/nterr.c	2007-10-05 21:28:54 UTC (rev 25533)
@@ -647,7 +647,6 @@
 
 const char *nt_errstr(NTSTATUS nt_code)
 {
-        static pstring msg;
         int idx = 0;
 
 #ifdef HAVE_LDAP
@@ -656,8 +655,6 @@
 	}
 #endif
 
-	slprintf(msg, sizeof(msg), "NT code 0x%08x", NT_STATUS_V(nt_code));
-
 	while (nt_errs[idx].nt_errstr != NULL) {
 		if (NT_STATUS_EQUAL(nt_errs[idx].nt_errcode, nt_code)) {
                         return nt_errs[idx].nt_errstr;
@@ -665,7 +662,8 @@
 		idx++;
 	}
 
-        return msg;
+	return talloc_asprintf(talloc_tos(), "NT code 0x%08x",
+			       NT_STATUS_V(nt_code));
 }
 
 /************************************************************************
@@ -689,28 +687,6 @@
 }
 
 /*****************************************************************************
- Returns an NT_STATUS constant as a string for inclusion in autogen C code.
- *****************************************************************************/
-
-const char *get_nt_error_c_code(NTSTATUS nt_code)
-{
-        static pstring out;
-        int idx = 0;
-
-	while (nt_errs[idx].nt_errstr != NULL) {
-		if (NT_STATUS_V(nt_errs[idx].nt_errcode) == 
-                    NT_STATUS_V(nt_code)) {
-                        return nt_errs[idx].nt_errstr;
-		}
-		idx++;
-	}
-
-	slprintf(out, sizeof(out), "NT_STATUS(0x%08x)", NT_STATUS_V(nt_code));
-
-        return out;
-}
-
-/*****************************************************************************
  Returns the NT_STATUS constant matching the string supplied (as an NTSTATUS)
  *****************************************************************************/
 

Modified: branches/SAMBA_3_2_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_3_2_0/source/torture/torture.c	2007-10-05 21:22:07 UTC (rev 25532)
+++ branches/SAMBA_3_2_0/source/torture/torture.c	2007-10-05 21:28:54 UTC (rev 25533)
@@ -4768,14 +4768,14 @@
 
 		if (NT_STATUS_V(nt_status) != error) { 
 			printf("/*\t{ This NT error code was 'sqashed'\n\t from %s to %s \n\t during the session setup }\n*/\n", 
-			       get_nt_error_c_code(NT_STATUS(error)), 
-			       get_nt_error_c_code(nt_status));
+			       nt_errstr(NT_STATUS(error)),
+			       nt_errstr(nt_status));
 		}
 		
 		printf("\t{%s,\t%s,\t%s},\n", 
 		       smb_dos_err_class(errclass), 
 		       smb_dos_err_name(errclass, errnum), 
-		       get_nt_error_c_code(NT_STATUS(error)));
+		       nt_errstr(NT_STATUS(error)));
 	}
 	return True;
 }