Moved smblib return/result/error values from smbdefs.h to smblib.h, where they

belong (with the function prototypes).

src/smblib/smbdefs.h

@@ -95,32 +95,6 @@
 #define SMB_HYPERALLOC		2			/* No allocation (also storage value for smb_addmsghdr) */
 #define SMB_NOHASH			4			/* Do not calculate or store hashes */
 
-#define SMB_SUCCESS			0			/* Successful result/return code */
-#define SMB_FAILURE			-1			/* Generic error (discouraged) */
-
-										/* Standard smblib errors values */
-#define SMB_ERR_NOT_OPEN	-100		/* Message base not open */
-#define SMB_ERR_HDR_LEN		-101		/* Invalid message header length (>64k) */
-#define SMB_ERR_HDR_OFFSET	-102		/* Invalid message header offset */
-#define SMB_ERR_HDR_ID		-103		/* Invalid header ID */
-#define SMB_ERR_HDR_VER		-104		/* Unsupported version */
-#define SMB_ERR_HDR_FIELD	-105		/* Missing header field */
-#define SMB_ERR_NOT_FOUND	-110		/* Item not found */
-#define SMB_ERR_DAT_OFFSET	-120		/* Invalid data offset (>2GB) */
-#define SMB_ERR_DAT_LEN		-121		/* Invalid data length (>2GB) */
-#define SMB_ERR_OPEN		-200		/* File open error */
-#define SMB_ERR_SEEK		-201		/* File seek/setpos error */
-#define SMB_ERR_LOCK		-202		/* File lock error */
-#define SMB_ERR_READ		-203		/* File read error */
-#define SMB_ERR_WRITE		-204		/* File write error */
-#define SMB_ERR_TIMEOUT		-205		/* File operation timed-out */
-#define SMB_ERR_FILE_LEN	-206		/* File length invalid */
-#define SMB_ERR_DELETE		-207		/* File deletion error */
-#define SMB_ERR_UNLOCK		-208		/* File unlock error */
-#define SMB_ERR_MEM			-300		/* Memory allocation error */
-
-#define SMB_DUPE_MSG		1			/* Duplicate message detected by smb_addcrc() */
-
 										/* Time zone macros for when_t.zone */
 #define DAYLIGHT			0x8000		/* Daylight savings is active */
 #define US_ZONE 			0x4000		/* U.S. time zone */

src/smblib/smblib.h

@@ -67,6 +67,32 @@
 
 #include "smbdefs.h"
 
+#define SMB_SUCCESS			0			/* Successful result/return code */
+#define SMB_FAILURE			-1			/* Generic error (discouraged) */
+
+										/* Standard smblib errors values */
+#define SMB_ERR_NOT_OPEN	-100		/* Message base not open */
+#define SMB_ERR_HDR_LEN		-101		/* Invalid message header length (>64k) */
+#define SMB_ERR_HDR_OFFSET	-102		/* Invalid message header offset */
+#define SMB_ERR_HDR_ID		-103		/* Invalid header ID */
+#define SMB_ERR_HDR_VER		-104		/* Unsupported version */
+#define SMB_ERR_HDR_FIELD	-105		/* Missing header field */
+#define SMB_ERR_NOT_FOUND	-110		/* Item not found */
+#define SMB_ERR_DAT_OFFSET	-120		/* Invalid data offset (>2GB) */
+#define SMB_ERR_DAT_LEN		-121		/* Invalid data length (>2GB) */
+#define SMB_ERR_OPEN		-200		/* File open error */
+#define SMB_ERR_SEEK		-201		/* File seek/setpos error */
+#define SMB_ERR_LOCK		-202		/* File lock error */
+#define SMB_ERR_READ		-203		/* File read error */
+#define SMB_ERR_WRITE		-204		/* File write error */
+#define SMB_ERR_TIMEOUT		-205		/* File operation timed-out */
+#define SMB_ERR_FILE_LEN	-206		/* File length invalid */
+#define SMB_ERR_DELETE		-207		/* File deletion error */
+#define SMB_ERR_UNLOCK		-208		/* File unlock error */
+#define SMB_ERR_MEM			-300		/* Memory allocation error */
+
+#define SMB_DUPE_MSG		1			/* Duplicate message detected by smb_addcrc() */
+
 #define SMB_STACK_LEN		4			/* Max msg bases in smb_stack() 	*/
 #define SMB_STACK_POP       0           /* Pop a msg base off of smb_stack()*/
 #define SMB_STACK_PUSH      1           /* Push a msg base onto smb_stack() */