Renamed get_nt_error_msg() to nt_errstr().

(This used to be commit 1f007d3ed41c1b71a89fa6be7d173e67e927c302)

3 files changed, 11 insertions, 11 deletions

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 08a9e742695..c34b4c1ad2d 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -299,7 +299,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS],
 			       conn, f, 
 			       (double)start, (double)len,
 			       op==READ_LOCK?"READ_LOCK":"WRITE_LOCK",
-			       get_nt_error_msg(status[0]), get_nt_error_msg(status[1]));
+			       nt_errstr(status[0]), nt_errstr(status[1]));
 		}
 		if (showall || !NT_STATUS_EQUAL(status[0],status[1])) show_locks();
 		if (!NT_STATUS_EQUAL(status[0],status[1])) return False;
@@ -318,7 +318,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS],
 			printf("unlock conn=%u f=%u range=%.0f(%.0f)       -> %s:%s\n",
 			       conn, f, 
 			       (double)start, (double)len,
-			       get_nt_error_msg(status[0]), get_nt_error_msg(status[1]));
+			       nt_errstr(status[0]), nt_errstr(status[1]));
 		}
 		if (showall || !NT_STATUS_EQUAL(status[0],status[1])) show_locks();
 		if (!hide_unlock_fails && !NT_STATUS_EQUAL(status[0],status[1])) 
diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 69c2bfe72f4..4f4164ea331 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -40,7 +40,7 @@ static void trans2_check_hit(char *format, int op, int level, NTSTATUS status)
 	}
 #if VERBOSE
 	printf("possible %s hit op=%3d level=%5d status=%s\n",
-	       format, op, level, get_nt_error_msg(status));
+	       format, op, level, nt_errstr(status));
 #endif
 }
 
@@ -89,7 +89,7 @@ static NTSTATUS try_trans2_len(struct cli_state *cli,
 	ret = try_trans2(cli, op, param, data, param_len,
 			 sizeof(pstring), rparam_len, rdata_len);
 #if VERBOSE 
-	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
+	printf("op=%d level=%d ret=%s\n", op, level, nt_errstr(ret));
 #endif
 	if (!NT_STATUS_IS_OK(ret)) return ret;
 
@@ -244,7 +244,7 @@ static void nttrans_check_hit(char *format, int op, int level, NTSTATUS status)
 	}
 #if VERBOSE
 		printf("possible %s hit op=%3d level=%5d status=%s\n",
-		       format, op, level, get_nt_error_msg(status));
+		       format, op, level, nt_errstr(status));
 #endif
 }
 
@@ -291,7 +291,7 @@ static NTSTATUS try_nttrans_len(struct cli_state *cli,
 	ret = try_nttrans(cli, op, param, data, param_len,
 			 sizeof(pstring), rparam_len, rdata_len);
 #if VERBOSE 
-	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
+	printf("op=%d level=%d ret=%s\n", op, level, nt_errstr(ret));
 #endif
 	if (!NT_STATUS_IS_OK(ret)) return ret;
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index cb9685f6b9b..cb064575735 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -187,7 +187,7 @@ static BOOL check_error(int line, struct cli_state *c,
                         printf("unexpected error code class=%d code=%d\n", 
                                (int)class, (int)num);
                         printf(" expected %d/%d %s (line=%d)\n", 
-                               (int)eclass, (int)ecode, get_nt_error_msg(nterr), line);
+                               (int)eclass, (int)ecode, nt_errstr(nterr), line);
                         return False;
                 }
 
@@ -199,8 +199,8 @@ static BOOL check_error(int line, struct cli_state *c,
                 status = cli_nt_error(c);
 
                 if (NT_STATUS_V(nterr) != NT_STATUS_V(status)) {
-                        printf("unexpected error code %s\n", get_nt_error_msg(status));
-                        printf(" expected %s (line=%d)\n", get_nt_error_msg(nterr), line);
+                        printf("unexpected error code %s\n", nt_errstr(status));
+                        printf(" expected %s (line=%d)\n", nt_errstr(nterr), line);
                         return False;
                 }
         }
@@ -1520,12 +1520,12 @@ static BOOL run_locktest6(int dummy)
 		fnum = cli_open(&cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 		status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
 		cli_close(&cli, fnum);
-		printf("CHANGE_LOCKTYPE gave %s\n", get_nt_error_msg(status));
+		printf("CHANGE_LOCKTYPE gave %s\n", nt_errstr(status));
 
 		fnum = cli_open(&cli, fname[i], O_RDWR, DENY_NONE);
 		status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
 		cli_close(&cli, fnum);
-		printf("CANCEL_LOCK gave %s\n", get_nt_error_msg(status));
+		printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
 
 		cli_unlink(&cli, fname[i]);
 	}