From d2af547887e073edf233a436ea169aa7a0186a4e Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 15:53:53 +0800
Subject: [PATCH] Just code formatting

---
 libscpi/inc/scpi/config.h |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/libscpi/inc/scpi/config.h b/libscpi/inc/scpi/config.h
index 75b9731..85cd07f 100644
--- a/libscpi/inc/scpi/config.h
+++ b/libscpi/inc/scpi/config.h
@@ -90,10 +90,10 @@
 #endif
 
 #ifndef USE_DEVICE_DEPENDENT_ERROR_INFORMATION
-#define USE_DEVICE_DEPENDENT_ERROR_INFORMATION 1
-	#ifndef USE_MEMORY_ALLOCATION_FREE
-	#define USE_MEMORY_ALLOCATION_FREE 1
-	#endif
+#define USE_DEVICE_DEPENDENT_ERROR_INFORMATION 0
+#ifndef USE_MEMORY_ALLOCATION_FREE
+#define USE_MEMORY_ALLOCATION_FREE 1
+#endif
 #endif
 
 
@@ -259,21 +259,23 @@
 #endif
 
 #if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
-	#if USE_MEMORY_ALLOCATION_FREE
-		#include <stdlib.h>
-		#include <string.h>
-		#include <malloc.h>
-		#define SCPIDEFINE_strdup(h,s)			strdup((s))
-		#define SCPIDEFINE_free(h,s)			free((s))
-	#else
-		#define SCPIDEFINE_strdup(h,s)			OUR_strdup((h), (s))
-		#define SCPIDEFINE_free(h,s)			OUR_free((h), (s))
-		#define SCPIDEFINE_get_1st_part(s,l)	OUR_get_1st_part((s),(l))
-		#define SCPIDEFINE_get_2st_part(s,l)	OUR_get_2nd_part((s),(l))
-	#endif
+
+#if USE_MEMORY_ALLOCATION_FREE
+#include <stdlib.h>
+#include <string.h>
+#define SCPIDEFINE_DESCRIPTION_MAX_PARTS		2
+#define SCPIDEFINE_strdup(h, s)					strdup((s))
+#define SCPIDEFINE_free(h, s, r)				free((s))
 #else
-	#define SCPIDEFINE_strdup(h,s)				(void)(s)
-	#define SCPIDEFINE_free(h,s)				(void)(s)
+#define SCPIDEFINE_DESCRIPTION_MAX_PARTS		3
+#define SCPIDEFINE_strdup(h, s)					OUR_strdup((h), (s))
+#define SCPIDEFINE_free(h, s, r)				OUR_free((h), (s), (r))
+#define SCPIDEFINE_get_parts(h, s, l1, s2, l2)	OUR_get_parts((h), (s), (l1), (s2), (l2))
+#endif
+#else
+#define SCPIDEFINE_DESCRIPTION_MAX_PARTS		1
+#define SCPIDEFINE_strdup(h, s)					NULL
+#define SCPIDEFINE_free(h, s, r)				(void)
 #endif
 
 #ifdef	__cplusplus

--
Gitblit v1.9.1