чување c995f21f0a965431529127161692bfaa63aeca83
родитељ e0dbba53c09c98df77dc1411a255f01657fb3dce
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Thu, 12 Aug 2021 09:06:45 +0200
Added do {} while (0) around macros to help indent
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
| M | index.html | | | 2 | +- |
| M | slweb.c | | | 338 | +++++++++++++++++++++++++++++++++++++++---------------------------------------- |
измењених датотека: 2, додавања: 169(+), брисања: 171(-)
diff --git a/index.html b/index.html
@@ -152,7 +152,7 @@ this program. If not, see <<a href="https://www.gnu.org/licenses">https://www
<div id="git-log">
Previous commit:
-index.slw acef960 2021-08-11 16:09:33 +0200 (Страхиња Радић) (HEAD -> master, origin/master, origin/HEAD)
+index.slw e0dbba5 2021-08-11 17:31:02 +0200 (Страхиња Радић) (HEAD -> master, origin/master, origin/HEAD)
</div><!--git-log-->
diff --git a/slweb.c b/slweb.c
@@ -34,33 +34,33 @@ static char* csv_filename = NULL;
static long csv_iter = 0;
static ULLONG state = ST_NONE;
-#define CHECKEXITNOMEM(ptr) { if (!ptr) exit(error(ENOMEM, \
- (u8*)"Memory allocation failed (out of memory?)")); }
+#define CHECKEXITNOMEM(ptr) do { if (!ptr) exit(error(ENOMEM, \
+ (u8*)"Memory allocation failed (out of memory?)")); } while (0)
-#define CALLOC(ptr, ptrtype, nmemb) { ptr = calloc(nmemb, sizeof(ptrtype)); \
- CHECKEXITNOMEM(ptr) }
+#define CALLOC(ptr, ptrtype, nmemb) do { ptr = calloc(nmemb, sizeof(ptrtype)); \
+ CHECKEXITNOMEM(ptr); } while (0)
-#define REALLOC(ptr, ptrtype, newsize) { ptrtype* newptr = realloc(ptr, newsize); \
- CHECKEXITNOMEM(newptr) \
- ptr = newptr; }
+#define REALLOC(ptr, ptrtype, newsize) do { ptrtype* newptr = realloc(ptr, newsize); \
+ CHECKEXITNOMEM(newptr); \
+ ptr = newptr; } while (0)
#define REALLOCARRAY(ptr, membtype, newcount) \
- REALLOC(ptr, membtype, sizeof(membtype) * newcount)
+ REALLOC(ptr, membtype, sizeof(membtype) * newcount);
-#define CHECKCOPY(token, ptoken, token_size, pline) { \
+#define CHECKCOPY(token, ptoken, token_size, pline) do { \
if (ptoken + 2 > token + token_size) \
{ \
size_t old_size = token_size; \
token_size += BUFSIZE; \
- REALLOC(token, u8, token_size) \
+ REALLOC(token, u8, token_size); \
ptoken = token + old_size - 1; \
} \
- *ptoken++ = *pline++; }
+ *ptoken++ = *pline++; } while (0)
-#define RESET_TOKEN(token, ptoken, token_size) { \
+#define RESET_TOKEN(token, ptoken, token_size) do { \
token_size = BUFSIZE; \
- REALLOC(token, u8, token_size) \
- *token = 0; ptoken = token; }
+ REALLOC(token, u8, token_size); \
+ *token = 0; ptoken = token; } while (0)
#define ALL(var, mask) ( ((var) & (mask)) == (mask) )
#define ANY(var, mask) ( (var) & (mask) )
@@ -149,8 +149,7 @@ slweb_cleanup()
return 0;
}
-int
-slweb_parse(u8* buffer, FILE* output, BOOL body_only,
+int slweb_parse(u8* buffer, FILE* output, BOOL body_only,
BOOL read_yaml_macros_and_links);
BOOL
@@ -201,7 +200,7 @@ set_basedir(char* arg, char** basedir, size_t* basedir_size)
if (arg_len + 1 > *basedir_size)
{
*basedir_size = arg_len+1;
- REALLOC(*basedir, char, *basedir_size)
+ REALLOC(*basedir, char, *basedir_size);
}
strncpy(*basedir, arg, *basedir_size-1);
*(*basedir + arg_len) = 0;
@@ -224,7 +223,7 @@ set_global_link_prefix(char* arg, char** global_link_prefix,
if (arg_len + 1 > *global_link_prefix_size)
{
*global_link_prefix_size = arg_len+1;
- REALLOC(*global_link_prefix, char, *global_link_prefix_size)
+ REALLOC(*global_link_prefix, char, *global_link_prefix_size);
}
strncpy(*global_link_prefix, arg, *global_link_prefix_size-1);
*(*global_link_prefix + arg_len) = 0;
@@ -245,7 +244,7 @@ strip_ext(const char* fn)
if (!dot)
return NULL;
- CALLOC(newname, char, strlen(fn)+1)
+ CALLOC(newname, char, strlen(fn)+1);
pnewname = newname;
pfn = fn;
@@ -273,7 +272,7 @@ print_output(FILE* output, char* fmt, ...)
if (!csv_template)
{
csv_template_size = BUFSIZE;
- CALLOC(csv_template, u8, csv_template_size)
+ CALLOC(csv_template, u8, csv_template_size);
strncpy((char*)csv_template, buf, BUFSIZE-1);
*(csv_template + buf_len) = 0;
}
@@ -282,7 +281,7 @@ print_output(FILE* output, char* fmt, ...)
if (strlen((char*)csv_template) + buf_len > csv_template_size)
{
csv_template_size += BUFSIZE;
- REALLOC(csv_template, u8, csv_template_size)
+ REALLOC(csv_template, u8, csv_template_size);
}
strncat((char*)csv_template, buf, csv_template_size
- strlen((char*)csv_template) - 1);
@@ -350,7 +349,7 @@ print_command(const char* command,
fclose(cmd_input);
u8* cmd_output_line = NULL;
- CALLOC(cmd_output_line, u8, BUFSIZE)
+ CALLOC(cmd_output_line, u8, BUFSIZE);
while (!feof(cmd_output))
{
if (!fgets((char*)cmd_output_line, BUFSIZE, cmd_output))
@@ -395,7 +394,7 @@ read_file_into_buffer(u8** buffer, size_t* buffer_size, char* input_filename,
if (*buffer)
free(*buffer);
*buffer_size = fs.st_size+1;
- CALLOC(*buffer, u8, *buffer_size)
+ CALLOC(*buffer, u8, *buffer_size);
fread((void*)*buffer, 1, *buffer_size, *input);
if (*input_dirname)
@@ -404,7 +403,7 @@ read_file_into_buffer(u8** buffer, size_t* buffer_size, char* input_filename,
slash = strrchr(input_filename, '/');
if (slash)
{
- CALLOC(*input_dirname, char, strlen(input_filename)+1)
+ CALLOC(*input_dirname, char, strlen(input_filename)+1);
char* pinput_dirname = *input_dirname;
char* pinput_filename = input_filename;
while (pinput_filename && *pinput_filename
@@ -413,7 +412,7 @@ read_file_into_buffer(u8** buffer, size_t* buffer_size, char* input_filename,
}
else
{
- CALLOC(*input_dirname, char, 2)
+ CALLOC(*input_dirname, char, 2);
**input_dirname = '.';
}
@@ -422,8 +421,7 @@ read_file_into_buffer(u8** buffer, size_t* buffer_size, char* input_filename,
return 0;
}
-int
-read_csv(FILE* output, const char* filename, csv_callback_t callback);
+int read_csv(FILE* output, const char* filename, csv_callback_t callback);
int
print_meta_var(FILE* output, u8** csv_header, u8** csv_register)
@@ -479,7 +477,7 @@ process_git_log(FILE* output)
char* basename = NULL;
size_t basename_size = strlen(input_filename)+1;
- CALLOC(basename, char, basename_size)
+ CALLOC(basename, char, basename_size);
char* slash = strrchr(input_filename, '/');
pid_t result = 0;
@@ -503,13 +501,13 @@ process_git_log(FILE* output)
return result ? warning(result, (u8*)"git-log: Cannot run git") : 0;
}
-#define PRINTIF(format, arg) { \
+#define PRINTIF(format, arg) do { \
if ((ALL(csv_state, ST_CS_COND_NONEMPTY) \
&& *csv_register[conditional_index-1]) \
|| (ALL(csv_state, ST_CS_COND_EMPTY) \
&& !*csv_register[conditional_index-1]) \
|| !ANY(csv_state, ST_CS_COND_EMPTY | ST_CS_COND_NONEMPTY)) \
- { fprintf(output, format, arg); } }
+ { fprintf(output, format, arg); } } while (0)
int
print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
@@ -523,7 +521,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
{
if (csv_state & ST_CS_ESCAPE)
{
- PRINTIF("%c", *pcsv_template)
+ PRINTIF("%c", *pcsv_template);
csv_state &= ~ST_CS_ESCAPE;
pcsv_template++;
continue;
@@ -538,7 +536,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
case '$':
if (csv_state & ST_CS_REGISTER)
{
- PRINTIF("%c", '$')
+ PRINTIF("%c", '$');
csv_state &= ~ST_CS_REGISTER;
}
else
@@ -557,7 +555,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
csv_state |= ST_CS_HEADER;
}
else
- PRINTIF("%c", '#')
+ PRINTIF("%c", '#');
pcsv_template++;
break;
case '?':
@@ -572,7 +570,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
csv_state |= ST_CS_COND;
}
else
- PRINTIF("%c", '?')
+ PRINTIF("%c", '?');
pcsv_template++;
break;
case '!':
@@ -588,7 +586,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
csv_state &= ~(ST_CS_COND | ST_CS_COND_EMPTY);
}
else
- PRINTIF("%c", '!')
+ PRINTIF("%c", '!');
pcsv_template++;
break;
case '/':
@@ -597,7 +595,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
else if (ALL(csv_state, ST_CS_COND))
csv_state &= ~(ST_CS_COND | ST_CS_COND_NONEMPTY);
else
- PRINTIF("%c", '/')
+ PRINTIF("%c", '/');
pcsv_template++;
break;
case '1': case '2': case '3': case '4': case '5':
@@ -611,17 +609,17 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
else if (csv_state & ST_CS_HEADER)
{
num = *pcsv_template - '0';
- PRINTIF("%s", csv_header[num-1])
+ PRINTIF("%s", csv_header[num-1]);
csv_state &= ~ST_CS_HEADER;
}
else if (csv_state & ST_CS_REGISTER)
{
num = *pcsv_template - '0';
- PRINTIF("%s", csv_register[num-1])
+ PRINTIF("%s", csv_register[num-1]);
csv_state &= ~ST_CS_REGISTER;
}
else
- PRINTIF("%c", *pcsv_template)
+ PRINTIF("%c", *pcsv_template);
pcsv_template++;
break;
default:
@@ -636,7 +634,7 @@ print_csv_row(FILE* output, u8** csv_header, u8** csv_register)
csv_state &= ~ST_CS_REGISTER;
}
else
- PRINTIF("%c", *pcsv_template)
+ PRINTIF("%c", *pcsv_template);
pcsv_template++;
}
}
@@ -667,13 +665,13 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
if (!(csv = fopen(filename, "rt")))
exit(error(ENOENT, (u8*)"csv: No such file: %s", filename));
- CALLOC(bufline, u8, BUFSIZE)
+ CALLOC(bufline, u8, BUFSIZE);
token_size = BUFSIZE;
- CALLOC(token, u8, token_size)
+ CALLOC(token, u8, token_size);
for (UBYTE i = 0; i < MAX_CSV_REGISTERS; i++)
- CALLOC(csv_header[i], u8, BUFSIZE)
+ CALLOC(csv_header[i], u8, BUFSIZE);
for (UBYTE i = 0; i < MAX_CSV_REGISTERS; i++)
- CALLOC(csv_register[i], u8, BUFSIZE)
+ CALLOC(csv_register[i], u8, BUFSIZE);
while (!feof(csv) && (!csv_iter || csv_lineno <= csv_iter))
{
@@ -685,7 +683,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
*eol = 0;
pbufline = bufline;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
current_register = 0;
while (*pbufline)
{
@@ -701,7 +699,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
case ';':
case ',':
if (csv_state & ST_CS_QUOTE)
- CHECKCOPY(token, ptoken, token_size, pbufline)
+ CHECKCOPY(token, ptoken, token_size, pbufline);
else
{
*ptoken = 0;
@@ -717,13 +715,13 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
strncpy((char*)csv_header[current_header++],
(char*)token, BUFSIZE-1);
}
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
pbufline++;
}
break;
default:
if (csv_state & ST_CS_QUOTE)
- CHECKCOPY(token, ptoken, token_size, pbufline)
+ CHECKCOPY(token, ptoken, token_size, pbufline);
else
{
if (csv_delimiter && *pbufline == *csv_delimiter)
@@ -741,11 +739,11 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
strncpy((char*)csv_header[current_header++],
(char*)token, BUFSIZE-1);
}
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
pbufline++;
}
else
- CHECKCOPY(token, ptoken, token_size, pbufline)
+ CHECKCOPY(token, ptoken, token_size, pbufline);
}
}
}
@@ -762,7 +760,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
strncpy((char*)csv_header[current_header++],
(char*)token, BUFSIZE-1);
}
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
if (csv_lineno > 0 && pbufline != bufline)
(*callback)(output, csv_header, csv_register);
@@ -821,7 +819,7 @@ process_csv(u8* arg_token, FILE* output, BOOL read_yaml_macros_and_links,
if (*args != '"' || *(args + args_len - 1) != '"')
exit(error(EINVAL, (u8*)"csv: First argument must be a string"));
if (!csv_filename)
- CALLOC(csv_filename, u8, BUFSIZE)
+ CALLOC(csv_filename, u8, BUFSIZE);
u8* args_base = (u8*)strdup((char*)args+1);
*(args_base + strlen((char*)args_base) - 1) = 0;
snprintf(csv_filename, BUFSIZE, "%s/%s.csv", input_dirname, (char*)args_base);
@@ -866,7 +864,7 @@ process_include(u8* token, FILE* output, BOOL read_yaml_macros_and_links)
{
prctl(PR_SET_PDEATHSIG, SIGTERM);
- CALLOC(include_filename, char, BUFSIZE)
+ CALLOC(include_filename, char, BUFSIZE);
pinclude_filename = include_filename;
ptoken++;
while (ptoken && *ptoken)
@@ -878,7 +876,7 @@ process_include(u8* token, FILE* output, BOOL read_yaml_macros_and_links)
if (!strcmp(basedir, "."))
set_basedir(input_dirname, &basedir, &basedir_size);
- CALLOC(input_filename, char, BUFSIZE)
+ CALLOC(input_filename, char, BUFSIZE);
snprintf(input_filename, BUFSIZE, "%s/%s.slw", basedir, include_filename);
free(include_filename);
@@ -1006,7 +1004,7 @@ filter_subdirs(const struct dirent* node)
struct stat st;
char* nodename = NULL;
- CALLOC(nodename, char, BUFSIZE)
+ CALLOC(nodename, char, BUFSIZE);
snprintf(nodename, BUFSIZE, "%s/%s", incdir, node->d_name);
if (lstat(nodename, &st) < 0 || !S_ISDIR(st.st_mode))
@@ -1066,7 +1064,7 @@ process_incdir_subdir(const char* subdirname, const u8* link_prefix,
long names_output;
char* abs_subdirname = NULL;
- CALLOC(abs_subdirname, char, BUFSIZE)
+ CALLOC(abs_subdirname, char, BUFSIZE);
snprintf(abs_subdirname, BUFSIZE, "%s/%s/%s", basedir, incdir, subdirname);
if ((names_total = scandir(abs_subdirname, &namelist, &filter_slw,
@@ -1085,7 +1083,7 @@ process_incdir_subdir(const char* subdirname, const u8* link_prefix,
/*
*char* basename = strip_ext((*pnamelist)->d_name);
*char* link = NULL;
- *CALLOC(link, char, BUFSIZE)
+ *CALLOC(link, char, BUFSIZE);
*snprintf(link, BUFSIZE, "%s/%s", subdirname, basename);
*/
@@ -1291,7 +1289,7 @@ process_timestamp(FILE* output, const u8* link_prefix, const char* link,
char* in_filename = NULL;
char* in_line = NULL;
- CALLOC(formatted_date, u8, DATEBUFSIZE)
+ CALLOC(formatted_date, u8, DATEBUFSIZE);
ptr = NULL;
year = (u8*)strtok_r((char*)date, "-", (char**)&ptr);
if (year)
@@ -1385,15 +1383,15 @@ process_macro(u8* token, FILE* output, BOOL read_yaml_macros_and_links,
if (!macros)
{
- CALLOC(macros, KeyValue, macros_count)
+ CALLOC(macros, KeyValue, macros_count);
pmacros = macros;
}
else
{
- REALLOC(macros, KeyValue, macros_count * sizeof(KeyValue))
+ REALLOC(macros, KeyValue, macros_count * sizeof(KeyValue));
pmacros = macros + macros_count - 1;
}
- CALLOC(pmacros->key, u8, KEYSIZE)
+ CALLOC(pmacros->key, u8, KEYSIZE);
pmacros->seen = FALSE;
strncpy((char*)pmacros->key, (char*)token+1, KEYSIZE-1);
pmacros->value = NULL;
@@ -1626,7 +1624,7 @@ get_realpath(char** realpath, char* relativeto, char* path)
u8* command = NULL;
FILE* cmd_output = NULL;
- CALLOC(command, u8, BUFSIZE)
+ CALLOC(command, u8, BUFSIZE);
strncpy(*realpath, ".", BUFSIZE-1);
snprintf((char*)command, BUFSIZE-1, "realpath --relative-to=%s %s",
relativeto, path);
@@ -1635,7 +1633,7 @@ get_realpath(char** realpath, char* relativeto, char* path)
if (cmd_output)
{
u8* cmd_output_line = NULL;
- CALLOC(cmd_output_line, u8, BUFSIZE)
+ CALLOC(cmd_output_line, u8, BUFSIZE);
while (!feof(cmd_output))
{
if (!fgets((char*)cmd_output_line, BUFSIZE, cmd_output))
@@ -1802,7 +1800,7 @@ process_text_token(u8* line, const u8* link_prefix,
output_firstcol = FALSE;
}
}
- RESET_TOKEN(*token, *ptoken, *token_size)
+ RESET_TOKEN(*token, *ptoken, *token_size);
return 0;
}
@@ -1822,11 +1820,11 @@ process_inline_footnote(u8* token, BOOL read_yaml_macros_and_links,
else if (!inline_footnotes)
{
inline_footnote_count = 1;
- CALLOC(inline_footnotes, u8*, inline_footnote_count)
+ CALLOC(inline_footnotes, u8*, inline_footnote_count);
}
else
- REALLOC(inline_footnotes, u8*, sizeof(u8*) * inline_footnote_count)
- CALLOC(inline_footnotes[inline_footnote_count-1], u8, token_len+1)
+ REALLOC(inline_footnotes, u8*, sizeof(u8*) * inline_footnote_count);
+ CALLOC(inline_footnotes[inline_footnote_count-1], u8, token_len+1);
strncpy((char*)inline_footnotes[inline_footnote_count-1], (char*)token,
token_len);
@@ -1857,15 +1855,15 @@ process_footnote(u8* token, BOOL footnote_definition, BOOL footnote_output,
warning(1, (u8*)"Both inline and regular footnotes present");
else if (!footnotes)
{
- CALLOC(footnotes, KeyValue, footnote_count)
+ CALLOC(footnotes, KeyValue, footnote_count);
pfootnotes = footnotes;
}
else
{
- REALLOCARRAY(footnotes, KeyValue, footnote_count)
+ REALLOCARRAY(footnotes, KeyValue, footnote_count);
pfootnotes = footnotes + footnote_count - 1;
}
- CALLOC(pfootnotes->key, u8, KEYSIZE)
+ CALLOC(pfootnotes->key, u8, KEYSIZE);
strncpy((char*)pfootnotes->key, (char*)token, KEYSIZE-1);
pfootnotes->value = NULL;
pfootnotes->value_size = 0;
@@ -1940,7 +1938,7 @@ begin_html_and_head(FILE* output)
site_name ? (char*)site_name : "");
char* favicon = NULL;
- CALLOC(favicon, char, BUFSIZE)
+ CALLOC(favicon, char, BUFSIZE);
snprintf(favicon, BUFSIZE-1, "%s/favicon.ico", basedir);
if (!access(favicon, R_OK))
print_output(output, "<link rel=\"shortcut icon\" type=\"image/x-icon\""
@@ -1951,7 +1949,7 @@ begin_html_and_head(FILE* output)
if (meta)
{
char* filename = NULL;
- CALLOC(filename, char, BUFSIZE)
+ CALLOC(filename, char, BUFSIZE);
snprintf(filename, BUFSIZE, "%s/%s", input_dirname, (char*)meta);
read_csv(output, filename, &print_meta_var);
free(filename);
@@ -2035,7 +2033,7 @@ begin_article(FILE* output, const u8* link_prefix,
char* real_link = NULL;
u8* permalink_macro = get_value(macros, macros_count,
(u8*)"permalink", NULL);
- CALLOC(real_link, char, BUFSIZE)
+ CALLOC(real_link, char, BUFSIZE);
if (ext_in_permalink)
strncat(link, timestamp_output_ext, BUFSIZE-strlen(link)-1);
@@ -2184,10 +2182,10 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
add_footnote_div = var_add_footnote_div && *var_add_footnote_div == '1';
link_prefix = get_value(vars, vars_count, (u8*)"link-prefix", NULL);
- CALLOC(line, u8, BUFSIZE)
+ CALLOC(line, u8, BUFSIZE);
token_size = BUFSIZE;
- CALLOC(token, u8, BUFSIZE)
- CALLOC(link_macro, u8, BUFSIZE)
+ CALLOC(token, u8, BUFSIZE);
+ CALLOC(link_macro, u8, BUFSIZE);
pbuffer = buffer;
pvars = vars;
@@ -2210,7 +2208,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
ext_in_permalink && *ext_in_permalink != '0',
(char*)permalink_url);
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
do
{
@@ -2242,7 +2240,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_MACRO_BODY | ST_PRE | ST_YAML_VAL))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
else if (colno == 1
@@ -2298,7 +2296,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -2316,21 +2314,21 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!vars)
{
- CALLOC(vars, KeyValue, vars_count)
+ CALLOC(vars, KeyValue, vars_count);
pvars = vars;
}
else
{
- REALLOCARRAY(vars, KeyValue, vars_count)
+ REALLOCARRAY(vars, KeyValue, vars_count);
pvars = vars + vars_count - 1;
}
- CALLOC(pvars->key, u8, KEYSIZE)
+ CALLOC(pvars->key, u8, KEYSIZE);
strncpy((char*)pvars->key, (char*)token, KEYSIZE-1);
pvars->value = NULL;
pvars->value_size = 0;
state |= ST_YAML_VAL;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
pline++;
colno++;
@@ -2341,7 +2339,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
}
else {
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -2352,7 +2350,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_LINK_SECOND_ARG_END | ST_MACRO_BODY
| ST_PRE | ST_TAG | ST_YAML))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2441,7 +2439,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_DISPLAY_FORMULA | ST_FORMULA | ST_IMAGE
| ST_MACRO_BODY))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2507,7 +2505,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -2551,7 +2549,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -2562,7 +2560,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_LINK_SECOND_ARG_END | ST_MACRO_BODY | ST_PRE
| ST_TAG | ST_YAML))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2654,7 +2652,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_HTML_TAG | ST_IMAGE | ST_MACRO_BODY | ST_PRE
| ST_YAML))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2702,7 +2700,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_HTML_TAG | ST_IMAGE | ST_MACRO_BODY | ST_PRE
| ST_YAML))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2844,7 +2842,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_IMAGE | ST_MACRO_BODY | ST_PRE | ST_YAML_VAL))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2898,12 +2896,12 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
*ptoken = 0;
strncpy((char*)link_macro, (char*)token, BUFSIZE-1);
*(link_macro + strlen((char*)token)) = 0;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state &= ~ST_LINK_MACRO;
}
else if (!(state & ST_HEADING
&& *(pline-1) == '#'))
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
@@ -2911,7 +2909,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_HTML_TAG | ST_PRE | ST_YAML | ST_YAML_VAL))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2927,7 +2925,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!macros)
{
macros_count = 1;
- CALLOC(macros, KeyValue, macros_count)
+ CALLOC(macros, KeyValue, macros_count);
pmacros = macros;
}
if (pmacros->value)
@@ -2937,7 +2935,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (pmacros->value_size < value_len + token_len + 1)
{
pmacros->value_size += token_len;
- REALLOC(pmacros->value, u8, pmacros->value_size)
+ REALLOC(pmacros->value, u8, pmacros->value_size);
}
strncat((char*)pmacros->value, (char*)token,
pmacros->value_size-1);
@@ -2945,7 +2943,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
else
{
pmacros->value_size = token_len+1;
- CALLOC(pmacros->value, u8, pmacros->value_size)
+ CALLOC(pmacros->value, u8, pmacros->value_size);
strncpy((char*)pmacros->value, (char*)token,
pmacros->value_size-1);
}
@@ -2962,7 +2960,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
state |= ST_TAG;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
pline++;
colno++;
@@ -2972,7 +2970,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_IMAGE | ST_PRE | ST_HEADING | ST_YAML_VAL))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -2983,7 +2981,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
pline++;
}
else
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
@@ -2992,7 +2990,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_IMAGE | ST_PRE | ST_YAML | ST_YAML_VAL))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3005,7 +3003,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
process_tag(token, link_prefix, output,
read_yaml_macros_and_links, &skip_eol, end_tag);
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
end_tag = FALSE;
}
@@ -3018,7 +3016,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_HTML_TAG | ST_IMAGE | ST_PRE | ST_TAG
| ST_YAML))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3121,7 +3119,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
default:
warning(1, (u8*)"Invalid partial table line");
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
}
@@ -3187,7 +3185,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
output_firstcol = TRUE;
}
}
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
pline++;
colno++;
}
@@ -3210,13 +3208,13 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
output_firstcol = TRUE;
}
}
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
pline++;
colno++;
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -3226,7 +3224,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
|| ANY(state, ST_DISPLAY_FORMULA | ST_FORMULA
| ST_IMAGE))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3244,7 +3242,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
state |= ST_HTML_TAG;
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
@@ -3255,7 +3253,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_DISPLAY_FORMULA | ST_FORMULA | ST_IMAGE
| ST_MACRO_BODY))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3278,7 +3276,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -3289,7 +3287,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_INLINE_FOOTNOTE | ST_LINK | ST_MACRO_BODY
| ST_PRE))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3304,7 +3302,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
&token, &ptoken, &token_size, FALSE);
processed_start_of_line = TRUE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state |= ST_IMAGE;
keep_token = TRUE;
@@ -3313,7 +3311,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
@@ -3323,7 +3321,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_MACRO_BODY | ST_PRE | ST_TAG))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3336,7 +3334,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -3347,7 +3345,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_HEADING | ST_IMAGE | ST_MACRO_BODY | ST_PRE))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3376,7 +3374,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
processed_start_of_line = TRUE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state |= ST_FOOTNOTE;
pline += 2;
colno += 2;
@@ -3393,7 +3391,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
processed_start_of_line = TRUE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state |= ST_LINK;
keep_token = TRUE;
*link_macro = 0;
@@ -3427,7 +3425,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_FOOTNOTE_TEXT | ST_HEADING
| ST_INLINE_FOOTNOTE | ST_LINK_SECOND_ARG_END
| ST_MACRO_BODY | ST_PRE))
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
else if (*link_macro && (state & ST_LINK))
{
u8* tag = (u8*)"<span>";
@@ -3448,7 +3446,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
pline++;
}
else
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
@@ -3456,7 +3454,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_DISPLAY_FORMULA | ST_FORMULA
| ST_LINK_SECOND_ARG_END))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3498,13 +3496,13 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
process_inline_image(link_text, link_prefix, token,
output, add_image_links, add_figcaption);
}
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state &= ~(ST_LINK | ST_LINK_SECOND_ARG
| ST_IMAGE | ST_IMAGE_SECOND_ARG);
pline++;
}
else
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
@@ -3512,7 +3510,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_HEADING | ST_MACRO_BODY | ST_PRE))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3524,7 +3522,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
output);
keep_token = FALSE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state &= ~ST_INLINE_FOOTNOTE;
pline++;
colno++;
@@ -3539,7 +3537,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
!footnote_definition && !read_yaml_macros_and_links,
output);
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state &= ~ST_FOOTNOTE;
footnote_at_line_start = FALSE;
pline++;
@@ -3563,7 +3561,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
get_value(macros, macros_count,
link_macro, NULL),
token, output);
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state &= ~(ST_LINK | ST_LINK_SECOND_ARG);
pline++;
colno++;
@@ -3573,7 +3571,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!read_yaml_macros_and_links)
process_image(link_text, link_prefix, token, output,
add_image_links, add_figcaption);
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state &= ~(ST_IMAGE | ST_IMAGE_SECOND_ARG);
pline++;
colno++;
@@ -3588,15 +3586,15 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!links)
{
- CALLOC(links, KeyValue, links_count)
+ CALLOC(links, KeyValue, links_count);
plinks = links;
}
else
{
- REALLOCARRAY(links, KeyValue, links_count)
+ REALLOCARRAY(links, KeyValue, links_count);
plinks = links + links_count - 1;
}
- CALLOC(plinks->key, u8, KEYSIZE)
+ CALLOC(plinks->key, u8, KEYSIZE);
strncpy((char*)plinks->key, (char*)token,
KEYSIZE-1);
plinks->value = NULL;
@@ -3608,7 +3606,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
pline++;
colno++;
}
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
keep_token = FALSE;
state |= ST_LINK_SECOND_ARG_END;
break;
@@ -3621,20 +3619,20 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (token_len + 1 > link_size)
{
link_size = token_len+1;
- REALLOC(link_text, u8, link_size)
+ REALLOC(link_text, u8, link_size);
}
}
else
{
link_size = token_len+1;
- CALLOC(link_text, u8, link_size)
+ CALLOC(link_text, u8, link_size);
}
strncpy((char*)link_text, (char*)token,
link_size-1);
*(link_text + token_len) = 0;
pline += 2;
colno += 2;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
keep_token = FALSE;
if (state & ST_LINK)
state |= ST_LINK_SECOND_ARG;
@@ -3642,7 +3640,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
state |= ST_IMAGE_SECOND_ARG;
break;
default:
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
state &= ~(ST_LINK | ST_IMAGE);
break;
@@ -3650,7 +3648,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
@@ -3660,7 +3658,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_FOOTNOTE_TEXT | ST_IMAGE | ST_INLINE_FOOTNOTE
| ST_PRE | ST_YAML))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3675,7 +3673,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
&token, &ptoken, &token_size, TRUE);
processed_start_of_line = TRUE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
state |= ST_INLINE_FOOTNOTE;
keep_token = TRUE;
pline += 2;
@@ -3683,7 +3681,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
break;
}
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
@@ -3693,7 +3691,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
| ST_HTML_TAG | ST_IMAGE | ST_LINK
| ST_MACRO_BODY))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3703,7 +3701,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
pline++;
colno++;
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
}
else
{
@@ -3718,7 +3716,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_CSV_BODY | ST_IMAGE | ST_PRE
| ST_YAML))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
break;
}
@@ -3752,7 +3750,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
process_formula(output, token, TRUE);
keep_token = FALSE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
}
pline += 2;
@@ -3786,7 +3784,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
process_formula(output, token, FALSE);
keep_token = FALSE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
}
pline++;
@@ -3799,7 +3797,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (ANY(state, ST_CODE | ST_DISPLAY_FORMULA | ST_FORMULA
| ST_MACRO_BODY | ST_PRE | ST_YAML_VAL))
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
else if (colno == 1
@@ -3835,13 +3833,13 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
else
{
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
break;
default:
- CHECKCOPY(token, ptoken, token_size, pline)
+ CHECKCOPY(token, ptoken, token_size, pline);
colno++;
}
}
@@ -3855,11 +3853,11 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!vars)
{
vars_count = 1;
- CALLOC(vars, KeyValue, vars_count)
+ CALLOC(vars, KeyValue, vars_count);
pvars = vars;
}
pvars->value_size = strlen((char*)token)+1;
- CALLOC(pvars->value, u8, pvars->value_size)
+ CALLOC(pvars->value, u8, pvars->value_size);
strncpy((char*)pvars->value, (char*)token, pvars->value_size-1);
}
else if (keep_token)
@@ -3870,7 +3868,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
{
size_t old_size = token_size;
token_size += BUFSIZE;
- REALLOC(token, u8, token_size)
+ REALLOC(token, u8, token_size);
ptoken = token + old_size - 1;
}
strncat((char*)token, ANY(state, ST_IMAGE | ST_LINK)
@@ -3893,7 +3891,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!macros)
{
macros_count = 1;
- CALLOC(macros, KeyValue, macros_count)
+ CALLOC(macros, KeyValue, macros_count);
pmacros = macros;
}
if (pmacros->value)
@@ -3903,7 +3901,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (pmacros->value_size < value_len + token_len + 1)
{
pmacros->value_size += BUFSIZE;
- REALLOC(pmacros->value, u8, pmacros->value_size)
+ REALLOC(pmacros->value, u8, pmacros->value_size);
}
strncat((char*)pmacros->value, (char*)token,
pmacros->value_size-value_len-1);
@@ -3914,7 +3912,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
else
{
pmacros->value_size = BUFSIZE;
- CALLOC(pmacros->value, u8, pmacros->value_size)
+ CALLOC(pmacros->value, u8, pmacros->value_size);
strncpy((char*)pmacros->value, (char*)token,
pmacros->value_size-1);
strncat((char*)pmacros->value, "\n",
@@ -3931,7 +3929,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!footnotes)
{
footnote_count = 1;
- CALLOC(footnotes, KeyValue, footnote_count)
+ CALLOC(footnotes, KeyValue, footnote_count);
pfootnotes = footnotes;
}
if (pfootnotes->value)
@@ -3941,7 +3939,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (pfootnotes->value_size < value_len + token_len + 1)
{
pfootnotes->value_size += BUFSIZE;
- REALLOC(pfootnotes->value, u8, pfootnotes->value_size)
+ REALLOC(pfootnotes->value, u8, pfootnotes->value_size);
}
strncat((char*)pfootnotes->value, (char*)token,
pfootnotes->value_size-value_len-1);
@@ -3952,7 +3950,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
else
{
pfootnotes->value_size = BUFSIZE;
- CALLOC(pfootnotes->value, u8, pfootnotes->value_size)
+ CALLOC(pfootnotes->value, u8, pfootnotes->value_size);
strncpy((char*)pfootnotes->value, (char*)token,
pfootnotes->value_size-1);
strncat((char*)pfootnotes->value, "\n",
@@ -3968,11 +3966,11 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!links)
{
links_count = 1;
- CALLOC(links, KeyValue, links_count)
+ CALLOC(links, KeyValue, links_count);
plinks = links;
}
plinks->value_size = strlen((char*)token)+1;
- CALLOC(plinks->value, u8, plinks->value_size)
+ CALLOC(plinks->value, u8, plinks->value_size);
strncpy((char*)plinks->value, (char*)token,
plinks->value_size-1);
}
@@ -3986,7 +3984,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
output_firstcol = FALSE;
}
first_line_in_doc = FALSE;
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
heading_level = 0;
}
else if (!ANY(state, ST_DISPLAY_FORMULA | ST_FORMULA
@@ -4046,7 +4044,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
if (!footnotes)
{
footnote_count = 1;
- CALLOC(footnotes, KeyValue, footnote_count)
+ CALLOC(footnotes, KeyValue, footnote_count);
pfootnotes = footnotes;
}
if (pfootnotes->value)
@@ -4057,7 +4055,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
{
pfootnotes->value_size
= value_len + token_len + 1;
- REALLOC(pfootnotes->value, u8, pfootnotes->value_size)
+ REALLOC(pfootnotes->value, u8, pfootnotes->value_size);
}
strncat((char*)pfootnotes->value, (char*)token,
pfootnotes->value_size-1);
@@ -4065,7 +4063,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
else
{
pfootnotes->value_size = token_len + 1;
- CALLOC(pfootnotes->value, u8, pfootnotes->value_size)
+ CALLOC(pfootnotes->value, u8, pfootnotes->value_size);
strncpy((char*)pfootnotes->value, (char*)token,
pfootnotes->value_size-1);
}
@@ -4115,7 +4113,7 @@ slweb_parse(u8* buffer, FILE* output, BOOL body_only,
}
if (!keep_token)
- RESET_TOKEN(token, ptoken, token_size)
+ RESET_TOKEN(token, ptoken, token_size);
if (!skip_change_first_line_in_doc
&& !(state & ST_YAML))
@@ -4157,7 +4155,7 @@ main(int argc, char** argv)
int result = 0;
basedir_size = 2;
- CALLOC(basedir, char, basedir_size)
+ CALLOC(basedir, char, basedir_size);
*basedir = '.';
while ((arg = *++argv))
@@ -4263,9 +4261,9 @@ main(int argc, char** argv)
input = stdin;
- CALLOC(bufline, u8, BUFSIZE)
+ CALLOC(bufline, u8, BUFSIZE);
buffer_size = BUFSIZE;
- CALLOC(buffer, u8, buffer_size)
+ CALLOC(buffer, u8, buffer_size);
while (!feof(input))
{
@@ -4279,7 +4277,7 @@ main(int argc, char** argv)
if (buffer_len + bufline_len + 1 > buffer_size)
{
buffer_size += BUFSIZE;
- REALLOC(buffer, u8, buffer_size)
+ REALLOC(buffer, u8, buffer_size);
}
strncat((char*)buffer, (char*)bufline, buffer_size-buffer_len-1);
buffer_len += bufline_len;
