--- var.c 2001/11/13 19:25:41 1.10
+++ var.c 2001/11/13 19:28:56 1.11
@@ -55,13 +55,13 @@
size_t buffer_size;
} tokenbuf;
-static void init_tokenbuf(tokenbuf * buf)
+static void init_tokenbuf(tokenbuf *buf)
{
buf->begin = buf->end = NULL;
buf->buffer_size = 0;
}
-static void move_tokenbuf(tokenbuf * src, tokenbuf * dst)
+static void move_tokenbuf(tokenbuf *src, tokenbuf *dst)
{
dst->begin = src->begin;
dst->end = src->end;
@@ -69,7 +69,7 @@
init_tokenbuf(src);
}
-static int assign_to_tokenbuf(tokenbuf * buf, const char *data, size_t len)
+static int assign_to_tokenbuf(tokenbuf *buf, const char *data, size_t len)
{
char *p = malloc(len + 1);
if (p) {
@@ -83,7 +83,7 @@
return 0;
}
-static int append_to_tokenbuf(tokenbuf * output, const char *data,
+static int append_to_tokenbuf(tokenbuf *output, const char *data,
size_t len)
{
char *new_buffer;
@@ -146,13 +146,13 @@
/* Append the data at the end of the current buffer. */
- memcpy((char *) output->end, data, len);
+ memcpy((char *)output->end, data, len);
output->end += len;
- *((char *) output->end) = '\0';
+ *((char *)output->end) = '\0';
return 1;
}
-static void free_tokenbuf(tokenbuf * buf)
+static void free_tokenbuf(tokenbuf *buf)
{
if (buf->begin != NULL && buf->buffer_size > 0)
free((char *) buf->begin);
@@ -160,7 +160,7 @@
buf->buffer_size = 0;
}
-static size_t tokenbuf2int(tokenbuf * number)
+static size_t tokenbuf2int(tokenbuf *number)
{
const char *p;
size_t num = 0;
@@ -176,7 +176,7 @@
static void expand_range(char a, char b, char class[256])
{
do {
- class[(int) a] = 1;
+ class[(int)a] = 1;
}
while (++a <= b);
}
@@ -408,7 +408,7 @@
}
static int substext(const char *begin, const char *end,
- const var_config_t * config)
+ const var_config_t *config)
{
const char *p;
for (p = begin; p != end && *p != config->varinit && *p != '/'; ++p) {
@@ -423,7 +423,7 @@
}
static int exptext(const char *begin, const char *end,
- const var_config_t * config)
+ const var_config_t *config)
{
const char *p;
for (p = begin;
@@ -441,10 +441,10 @@
static int expression(const char *begin, const char *end,
- const var_config_t * config,
+ const var_config_t *config,
const char nameclass[256], var_cb_t lookup,
void *lookup_context, int force_expand,
- tokenbuf * result)
+ tokenbuf *result)
{
const char *p = begin;
const char *data;
@@ -590,9 +590,9 @@
}
static int variable(const char *begin, const char *end,
- const var_config_t * config, const char nameclass[256],
+ const var_config_t *config, const char nameclass[256],
var_cb_t lookup, void *lookup_context,
- int force_expand, tokenbuf * result)
+ int force_expand, tokenbuf *result)
{
const char *p = begin;
const char *data;
@@ -649,10 +649,10 @@
}
static int exptext_or_variable(const char *begin, const char *end,
- const var_config_t * config,
+ const var_config_t *config,
const char nameclass[256], var_cb_t lookup,
void *lookup_context, int force_expand,
- tokenbuf * result)
+ tokenbuf *result)
{
const char *p = begin;
tokenbuf tmp;
@@ -701,10 +701,10 @@
}
static int substext_or_variable(const char *begin, const char *end,
- const var_config_t * config,
+ const var_config_t *config,
const char nameclass[256], var_cb_t lookup,
void *lookup_context, int force_expand,
- tokenbuf * result)
+ tokenbuf *result)
{
const char *p = begin;
tokenbuf tmp;
@@ -753,7 +753,7 @@
}
-static int expand_class_description(tokenbuf * src, tokenbuf * dst)
+static int expand_class_description(tokenbuf *src, tokenbuf *dst)
{
unsigned char c, d;
const char *p = src->begin;
@@ -776,8 +776,8 @@
return VAR_OK;
}
-static int transpose(tokenbuf * data, tokenbuf * search,
- tokenbuf * replace)
+static int transpose(tokenbuf *data, tokenbuf *search,
+ tokenbuf *replace)
{
tokenbuf srcclass, dstclass;
const char *p;
@@ -832,8 +832,8 @@
return rc;
}
-static int cut_out_offset(tokenbuf * data, tokenbuf * number1,
- tokenbuf * number2, int isrange)
+static int cut_out_offset(tokenbuf *data, tokenbuf *number1,
+ tokenbuf *number2, int isrange)
{
tokenbuf res;
const char *p;
@@ -873,8 +873,8 @@
return VAR_OK;
}
-static int expand_regex_replace(const char *data, tokenbuf * orig,
- regmatch_t * pmatch, tokenbuf * expanded)
+static int expand_regex_replace(const char *data, tokenbuf *orig,
+ regmatch_t *pmatch, tokenbuf *expanded)
{
const char *p = orig->begin;
size_t i;
@@ -923,8 +923,8 @@
return VAR_OK;
}
-static int search_and_replace(tokenbuf * data, tokenbuf * search,
- tokenbuf * replace, tokenbuf * flags)
+static int search_and_replace(tokenbuf *data, tokenbuf *search,
+ tokenbuf *replace, tokenbuf *flags)
{
const char *p;
int case_insensitive = 0;
@@ -1063,7 +1063,7 @@
return VAR_OK;
}
-static int padding(tokenbuf * data, tokenbuf * widthstr, tokenbuf * fill,
+static int padding(tokenbuf *data, tokenbuf *widthstr, tokenbuf *fill,
char position)
{
tokenbuf result;
@@ -1175,9 +1175,9 @@
}
static int command(const char *begin, const char *end,
- const var_config_t * config, const char nameclass[256],
+ const var_config_t *config, const char nameclass[256],
var_cb_t lookup, void *lookup_context, int force_expand,
- tokenbuf * data)
+ tokenbuf *data)
{
const char *p = begin;
tokenbuf tmptokbuf;
@@ -1510,10 +1510,10 @@
}
static var_rc_t input(const char *begin, const char *end,
- const var_config_t * config,
+ const var_config_t *config,
const char nameclass[256], var_cb_t lookup,
void *lookup_context, int force_expand,
- tokenbuf * output)
+ tokenbuf *output)
{
int rc;
tokenbuf result;
@@ -1558,9 +1558,9 @@
}
var_rc_t var_expand(const char *input_buf, size_t input_len,
- char **result, size_t * result_len,
+ char **result, size_t *result_len,
var_cb_t lookup, void *lookup_context,
- const var_config_t * config, int force_expand)
+ const var_config_t *config, int force_expand)
{
char nameclass[256];
var_rc_t rc;
|
