From 6110e0eeedb48c81fad0e5175aa3639f1a703bfa Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周一, 12 10月 2015 21:51:20 +0800 Subject: [PATCH] Format and trailing space cleanup --- libscpi/src/parser.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c index c996764..acb53a8 100644 --- a/libscpi/src/parser.c +++ b/libscpi/src/parser.c @@ -339,7 +339,7 @@ * @return */ static size_t resultUInt32BaseSign(scpi_t * context, uint32_t val, int8_t base, scpi_bool_t sign) { - char buffer[32+1]; + char buffer[32 + 1]; const char * basePrefix; size_t result = 0; size_t len; @@ -365,7 +365,7 @@ * @return */ static size_t resultUInt64BaseSign(scpi_t * context, uint64_t val, int8_t base, scpi_bool_t sign) { - char buffer[64+1]; + char buffer[64 + 1]; const char * basePrefix; size_t result = 0; size_t len; @@ -487,7 +487,7 @@ SCPI_UInt32ToStrBase((uint32_t) len, block_header + 2, 10, 10); header_len = strlen(block_header + 2); - block_header[1] = (char)(header_len + '0'); + block_header[1] = (char) (header_len + '0'); result += writeData(context, block_header, header_len + 2); result += writeData(context, data, len); @@ -623,7 +623,7 @@ case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA: case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX: if (sign) { - return strBaseToInt32(parameter->ptr, (int32_t *)value, 10) > 0 ? TRUE : FALSE; + return strBaseToInt32(parameter->ptr, (int32_t *) value, 10) > 0 ? TRUE : FALSE; } else { return strBaseToUInt32(parameter->ptr, value, 10) > 0 ? TRUE : FALSE; } @@ -657,7 +657,7 @@ case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA: case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX: if (sign) { - return strBaseToInt64(parameter->ptr, (int64_t *)value, 10) > 0 ? TRUE : FALSE; + return strBaseToInt64(parameter->ptr, (int64_t *) value, 10) > 0 ? TRUE : FALSE; } else { return strBaseToUInt64(parameter->ptr, value, 10) > 0 ? TRUE : FALSE; } @@ -674,7 +674,7 @@ * @return TRUE if succesful */ scpi_bool_t SCPI_ParamToInt32(scpi_t * context, scpi_parameter_t * parameter, int32_t * value) { - return ParamSignToUInt32(context, parameter, (uint32_t *)value, TRUE); + return ParamSignToUInt32(context, parameter, (uint32_t *) value, TRUE); } /** @@ -684,7 +684,7 @@ * @param value result * @return TRUE if succesful */ -scpi_bool_t SCPI_ParamToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value) { +scpi_bool_t SCPI_ParamToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value) { return ParamSignToUInt32(context, parameter, value, FALSE); } @@ -696,7 +696,7 @@ * @return TRUE if succesful */ scpi_bool_t SCPI_ParamToInt64(scpi_t * context, scpi_parameter_t * parameter, int64_t * value) { - return ParamSignToUInt64(context, parameter, (uint64_t *)value, TRUE); + return ParamSignToUInt64(context, parameter, (uint64_t *) value, TRUE); } /** @@ -706,7 +706,7 @@ * @param value result * @return TRUE if succesful */ -scpi_bool_t SCPI_ParamToUInt64(scpi_t * context, scpi_parameter_t * parameter, uint64_t * value) { +scpi_bool_t SCPI_ParamToUInt64(scpi_t * context, scpi_parameter_t * parameter, uint64_t * value) { return ParamSignToUInt64(context, parameter, value, FALSE); } @@ -910,7 +910,7 @@ * @return */ scpi_bool_t SCPI_ParamInt32(scpi_t * context, int32_t * value, scpi_bool_t mandatory) { - return ParamSignUInt32(context, (uint32_t *)value, mandatory, TRUE); + return ParamSignUInt32(context, (uint32_t *) value, mandatory, TRUE); } /** @@ -932,7 +932,7 @@ * @return */ scpi_bool_t SCPI_ParamInt64(scpi_t * context, int64_t * value, scpi_bool_t mandatory) { - return ParamSignUInt64(context, (uint64_t *)value, mandatory, TRUE); + return ParamSignUInt64(context, (uint64_t *) value, mandatory, TRUE); } /** @@ -965,7 +965,7 @@ result = SCPI_Parameter(context, ¶m, mandatory); if (result) { - switch(param.type) { + switch (param.type) { case SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA: case SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA: *value = param.ptr + 1; @@ -1334,7 +1334,7 @@ } pattern = context->param_list.cmd->pattern; - return matchCommand (pattern, cmd, strlen (cmd), NULL, 0, 0); + return matchCommand(pattern, cmd, strlen(cmd), NULL, 0, 0); } /** @@ -1351,11 +1351,11 @@ } scpi_bool_t SCPI_Match(const char * pattern, const char * value, size_t len) { - return matchCommand (pattern, value, len, NULL, 0, 0); + return matchCommand(pattern, value, len, NULL, 0, 0); } scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len, int32_t default_value) { - return matchCommand (context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len, default_value); + return matchCommand(context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len, default_value); } /** @@ -1364,8 +1364,7 @@ * @param parameter * @return */ -scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter) -{ +scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter) { return parameter->type == SCPI_TOKEN_UNKNOWN ? FALSE : TRUE; } @@ -1374,7 +1373,6 @@ * @param context * @return */ -scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context) -{ +scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context) { return context->cmd_error; } -- Gitblit v1.9.1