Move some smb prototypes in smb.h

Moreover:
Add a const qualifier

diff --git a/netdissect.h b/netdissect.h
index af51fab8bb793089858d5594c2ff8e69da163928..0d996854b2ffa879583ac0304ade6ac27ccd2328 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -663,9 +663,6 @@ extern int mask62plen(const u_char *);
 extern const char *dnname_string(netdissect_options *, u_short);
 extern const char *dnnum_string(netdissect_options *, u_short);
 
-extern char *smb_errstr(int, int);
-extern const char *nt_errstr(uint32_t);
-
 extern int decode_prefix4(netdissect_options *, const u_char *, u_int, char *, u_int);
 extern int decode_prefix6(netdissect_options *, const u_char *, u_int, char *, u_int);
 

diff --git a/smb.h b/smb.h
index b521617fe01a2f8dfadb1699b44ee0d08a471578..d3bda569376f10624bf53c7ed37297b967c8836e 100644 (file)
--- a/smb.h
+++ b/smb.h
@@ -120,3 +120,5 @@
 
 /* some protos */
 const u_char *smb_fdata(netdissect_options *, const u_char *, const char *, const u_char *, int);
+extern const char *smb_errstr(int, int);
+extern const char *nt_errstr(uint32_t);

diff --git a/smbutil.c b/smbutil.c
index 61086a49227e02e396c7225a72161c258b087509..65af3727c163a8041c03e39f08cbe7ef25a8d2fa 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -1012,7 +1012,7 @@ static const struct {
 /*
  * return a SMB error string from a SMB buffer
  */
-char *
+const char *
 smb_errstr(int class, int num)
 {
     static char ret[128];