mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Some cleanup.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2735 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
@@ -382,7 +382,7 @@ typedef struct parser_env {
|
|||||||
|
|
||||||
var_store_ptr unnamed_vars;
|
var_store_ptr unnamed_vars;
|
||||||
|
|
||||||
char *parse_str;
|
const char *parse_str;
|
||||||
char radix_point;
|
char radix_point;
|
||||||
char group_char;
|
char group_char;
|
||||||
char name[50];
|
char name[50];
|
||||||
@@ -393,7 +393,7 @@ typedef struct parser_env {
|
|||||||
ParseError error_code;
|
ParseError error_code;
|
||||||
|
|
||||||
void *numeric_value;
|
void *numeric_value;
|
||||||
void *(*trans_numeric)(char *digit_str,
|
void *(*trans_numeric)(const char *digit_str,
|
||||||
char radix_point,
|
char radix_point,
|
||||||
char group_char,
|
char group_char,
|
||||||
char **rstr);
|
char **rstr);
|
||||||
@@ -423,7 +423,7 @@ parser_env_ptr
|
|||||||
init_parser(var_store_ptr predefined_vars,
|
init_parser(var_store_ptr predefined_vars,
|
||||||
char radix_point,
|
char radix_point,
|
||||||
char group_char,
|
char group_char,
|
||||||
void *trans_numeric(char *digit_str,
|
void *trans_numeric(const char *digit_str,
|
||||||
char radix_point,
|
char radix_point,
|
||||||
char group_char,
|
char group_char,
|
||||||
char **rstr),
|
char **rstr),
|
||||||
@@ -530,7 +530,7 @@ unsigned delete_var(char *var_name,
|
|||||||
* error occured. */
|
* error occured. */
|
||||||
char *
|
char *
|
||||||
parse_string(var_store_ptr value,
|
parse_string(var_store_ptr value,
|
||||||
char *string,
|
const char *string,
|
||||||
parser_env_ptr pe)
|
parser_env_ptr pe)
|
||||||
{
|
{
|
||||||
var_store_ptr retv;
|
var_store_ptr retv;
|
||||||
@@ -560,7 +560,7 @@ parse_string(var_store_ptr value,
|
|||||||
|
|
||||||
pe->unnamed_vars = NULL;
|
pe->unnamed_vars = NULL;
|
||||||
|
|
||||||
return pe->parse_str;
|
return (char *) pe->parse_str;
|
||||||
} /* expression */
|
} /* expression */
|
||||||
|
|
||||||
/* pop value off value stack */
|
/* pop value off value stack */
|
||||||
@@ -670,8 +670,8 @@ static void free_var(var_store_ptr value,
|
|||||||
*/
|
*/
|
||||||
static void next_token(parser_env_ptr pe)
|
static void next_token(parser_env_ptr pe)
|
||||||
{
|
{
|
||||||
char *nstr,
|
char *nstr;
|
||||||
*str_parse = pe->parse_str;
|
const char *str_parse = pe->parse_str;
|
||||||
void *number;
|
void *number;
|
||||||
|
|
||||||
while ( isspace(*str_parse) ) str_parse++;
|
while ( isspace(*str_parse) ) str_parse++;
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ parser_env_ptr init_parser(
|
|||||||
var_store_ptr predefined_vars,
|
var_store_ptr predefined_vars,
|
||||||
char radix_point,
|
char radix_point,
|
||||||
char group_char,
|
char group_char,
|
||||||
void *trans_numeric(char *digit_str,
|
void *trans_numeric(const char *digit_str,
|
||||||
char radix_point,
|
char radix_point,
|
||||||
char group_char,
|
char group_char,
|
||||||
char **rstr),
|
char **rstr),
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ unsigned delete_var(char *var_name,
|
|||||||
parser_env_ptr pe);
|
parser_env_ptr pe);
|
||||||
/* Line Number: 451 */
|
/* Line Number: 451 */
|
||||||
char *parse_string(var_store_ptr value,
|
char *parse_string(var_store_ptr value,
|
||||||
char *string,
|
const char *string,
|
||||||
parser_env_ptr pe);
|
parser_env_ptr pe);
|
||||||
|
|
||||||
/*==================================================*/
|
/*==================================================*/
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ static double pos_table[] = {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void *trans_numeric(
|
void *trans_numeric(
|
||||||
char *str, /* pointer to string to translate */
|
const char *str, /* pointer to string to translate */
|
||||||
char radix_point, /* radix character */
|
char radix_point, /* radix character */
|
||||||
char group_char, /* grouping character to left of radix */
|
char group_char, /* grouping character to left of radix */
|
||||||
char **endstr) /* where to return pointer to first unrecognized character */
|
char **endstr) /* where to return pointer to first unrecognized character */
|
||||||
@@ -99,7 +99,7 @@ char **endstr) /* where to return pointer to first unrecognized charac
|
|||||||
unsigned radix = 0,
|
unsigned radix = 0,
|
||||||
sign = 0,
|
sign = 0,
|
||||||
digit_cnt = 0;
|
digit_cnt = 0;
|
||||||
char *strinit = str;
|
const char *strinit = str;
|
||||||
numeric_ptr rslt = NULL;
|
numeric_ptr rslt = NULL;
|
||||||
|
|
||||||
while ( isspace(*str) ) str++;
|
while ( isspace(*str) ) str++;
|
||||||
@@ -225,8 +225,8 @@ char **endstr) /* where to return pointer to first unrecognized charac
|
|||||||
} /* endif */
|
} /* endif */
|
||||||
|
|
||||||
if ( endstr ) {
|
if ( endstr ) {
|
||||||
if ( !digit_cnt ) *endstr = strinit;
|
if ( !digit_cnt ) *endstr = (char *) strinit;
|
||||||
else *endstr = str;
|
else *endstr = (char *) str;
|
||||||
} /* endif */
|
} /* endif */
|
||||||
|
|
||||||
return (void *)rslt;
|
return (void *)rslt;
|
||||||
|
|||||||
Reference in New Issue
Block a user