r25010: Avoid uses of pstring

(This used to be commit cce7785474fc536dd44b39403c785b524b128144)

diff --git a/source4/libcli/util/doserr.c b/source4/libcli/util/doserr.c
index d62a31c1fab30c0d2148c8d5ebd6695ff6c85c09..49818e573a4668e512b727d289beb9de2fe56b1b 100644 (file)
--- a/source4/libcli/util/doserr.c
+++ b/source4/libcli/util/doserr.c
@@ -20,7 +20,6 @@
 /* DOS error codes.  please read doserr.h */
 
 #include "includes.h"
-#include "pstring.h"
 
 struct werror_code_struct {
        const char *dos_errstr;
@@ -133,7 +132,7 @@ static const struct werror_code_struct dos_errs[] =
  *****************************************************************************/
 const char *win_errstr(WERROR werror)
 {
-        static pstring msg;
+        static char msg[40];
         int idx = 0;
 
        while (dos_errs[idx].dos_errstr != NULL) {

diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index 3aea0b51bced33416530a681c46a6fbe92facb3b..b1f345016d012fd8456cbf1cddb415f306cb60e7 100644 (file)
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -20,7 +20,6 @@
 /* NT error codes.  please read nterr.h */
 
 #include "includes.h"
-#include "pstring.h"
 #include "libcli/ldap/ldap.h"
 
 typedef struct
@@ -862,7 +861,7 @@ const char *get_friendly_nt_error_msg(NTSTATUS nt_code)
  *****************************************************************************/
 const char *get_nt_error_c_code(NTSTATUS nt_code)
 {
-        static pstring out;
+        static char out[40];
         int idx = 0;
 
        while (nt_errs[idx].nt_errstr != NULL) {