From 7f3d9c0c0238b1fec92fff04f87730668100b73b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 04 8月 2015 00:39:04 +0800
Subject: [PATCH] Cleanup of macros and defines

---
 libscpi/src/parser.c |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 375f4ac..921e885 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -44,6 +44,7 @@
 #include "scpi/error.h"
 #include "scpi/constants.h"
 #include "scpi/utils.h"
+#include "scpi/debug.h"
 
 /**
  * Write data to SCPI output
@@ -90,7 +91,10 @@
 static size_t writeNewLine(scpi_t * context) {
     if (context->output_count > 0) {
         size_t len;
-        len = writeData(context, "\r\n", 2);
+#ifndef SCPI_LINE_ENDING
+#error no termination character defined
+#endif
+        len = writeData(context, SCPI_LINE_ENDING, strlen(SCPI_LINE_ENDING));
         flushData(context);
         return len;
     } else {
@@ -327,7 +331,7 @@
 /**
  * Return prefix of nondecimal base
  * @param base
- * @return 
+ * @return
  */
 static const char * getBasePrefix(int8_t base) {
     switch (base) {
@@ -343,7 +347,7 @@
  * @param context
  * @param val
  * @param base
- * @return 
+ * @return
  */
 size_t SCPI_ResultIntBase(scpi_t * context, int32_t val, int8_t base) {
     char buffer[33];
@@ -402,7 +406,7 @@
  * @param context
  * @param data
  * @param len
- * @return 
+ * @return
  */
 size_t SCPI_ResultArbitraryBlock(scpi_t * context, const char * data, size_t len) {
     size_t result = 0;
@@ -449,7 +453,7 @@
  * @param context
  * @param parameter
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, scpi_bool_t mandatory) {
     lex_state_t * state;
@@ -507,7 +511,7 @@
  * Detect if parameter is number
  * @param parameter
  * @param suffixAllowed
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamIsNumber(scpi_parameter_t * parameter, scpi_bool_t suffixAllowed) {
     switch (parameter->type) {
@@ -528,7 +532,7 @@
  * @param context
  * @param parameter
  * @param value result
- * @return true if succesful
+ * @return TRUE if succesful
  */
 scpi_bool_t SCPI_ParamToInt(scpi_t * context, scpi_parameter_t * parameter, int32_t * value) {
 
@@ -556,7 +560,7 @@
  * @param context
  * @param parameter
  * @param value result
- * @return true if succesful
+ * @return TRUE if succesful
  */
 scpi_bool_t SCPI_ParamToDouble(scpi_t * context, scpi_parameter_t * parameter, double * value) {
     scpi_bool_t result = FALSE;
@@ -587,7 +591,7 @@
  * @param context
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamDouble(scpi_t * context, double * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -618,7 +622,7 @@
  * @param context
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -650,7 +654,7 @@
  * @param value
  * @param len
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamCharacters(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -678,7 +682,7 @@
  * @param value result pointer to data
  * @param len result length of data
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamArbitraryBlock(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -748,7 +752,7 @@
  * @param parameter - should be PROGRAM_MNEMONIC
  * @param options - NULL terminated list of choices
  * @param value - index to options
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamToChoice(scpi_t * context, scpi_parameter_t * parameter, const scpi_choice_def_t * options, int32_t * value) {
     size_t res;
@@ -783,7 +787,7 @@
  * @param options specifications of choices numbers (patterns)
  * @param tag numerical representatio of choice
  * @param text result text
- * @return true if succesfule, else false
+ * @return TRUE if succesfule, else false
  */
 scpi_bool_t SCPI_ChoiceToName(const scpi_choice_def_t * options, int32_t tag, const char ** text) {
     int i;
@@ -803,7 +807,7 @@
  * @param context
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamBool(scpi_t * context, scpi_bool_t * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -844,7 +848,7 @@
  * @param options
  * @param value
  * @param mandatory
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_ParamChoice(scpi_t * context, const scpi_choice_def_t * options, int32_t * value, scpi_bool_t mandatory) {
     scpi_bool_t result;
@@ -867,7 +871,7 @@
  * Parse one parameter and detect type
  * @param state
  * @param token
- * @return 
+ * @return
  */
 int scpiParser_parseProgramData(lex_state_t * state, scpi_token_t * token) {
     scpi_token_t tmp;
@@ -906,7 +910,7 @@
  * @param state
  * @param token
  * @param numberOfParameters
- * @return 
+ * @return
  */
 int scpiParser_parseAllProgramData(lex_state_t * state, scpi_token_t * token, int * numberOfParameters) {
 
@@ -956,7 +960,7 @@
  * @param state
  * @param buffer
  * @param len
- * @return 
+ * @return
  */
 int scpiParser_detectProgramMessageUnit(scpi_parser_state_t * state, char * buffer, int len) {
     lex_state_t lex_state;
@@ -1009,14 +1013,16 @@
  *  - suitable for one handle to multiple commands
  * @param context
  * @param cmd
- * @return 
+ * @return
  */
 scpi_bool_t SCPI_IsCmd(scpi_t * context, const char * cmd) {
+    const char * pattern;
+
     if (!context->param_list.cmd) {
         return FALSE;
     }
 
-    const char * pattern = context->param_list.cmd->pattern;
+    pattern = context->param_list.cmd->pattern;
     return matchCommand (pattern, cmd, strlen (cmd), NULL, 0);
 }
 

--
Gitblit v1.9.1