diff options
author | Xavier Mendez <me@jmendeth.com> | 2014-10-19 20:09:19 +0200 |
---|---|---|
committer | Xavier Mendez <me@jmendeth.com> | 2014-10-19 20:09:19 +0200 |
commit | b9c56bdc8858016dd86ffbc3e7d93e4747dd4af3 (patch) | |
tree | 767eb8807481031d276ae35eb7064610daad362e | |
parent | 9aa8c8acf1b851986cf67650797d456cfa6ad1a5 (diff) | |
download | rust-hoedown-b9c56bdc8858016dd86ffbc3e7d93e4747dd4af3.tar.gz |
Use a stricter subset of C in the executables
-rw-r--r-- | bin/hoedown.c | 40 | ||||
-rw-r--r-- | bin/smartypants.c | 27 |
2 files changed, 35 insertions, 32 deletions
diff --git a/bin/hoedown.c b/bin/hoedown.c index 15f2e61..f3fc5e5 100644 --- a/bin/hoedown.c +++ b/bin/hoedown.c @@ -2,14 +2,14 @@ #include "html.h" #include "common.h" -//#include <time.h> +/*#include <time.h>*/ /* NULL RENDERER */ enum renderer_type { RENDERER_HTML, RENDERER_HTML_TOC, - RENDERER_NULL, + RENDERER_NULL }; hoedown_renderer * @@ -92,6 +92,9 @@ static const char *negative_prefix = "no-"; void print_help(const char *basename) { + size_t i; + size_t e; + /* usage */ printf("Usage: %s [OPTION]... [FILE]\n\n", basename); @@ -114,8 +117,6 @@ print_help(const char *basename) { printf("\n"); /* extensions */ - size_t i; - size_t e; for (i = 0; i < count_of(categories_info); i++) { struct extension_category_info *category = categories_info+i; printf("%s (--%s%s):\n", category->label, category_prefix, category->option_name); @@ -151,7 +152,7 @@ int main(int argc, char **argv) { int show_time = 0; - //struct timespec start, end; + /*struct timespec start, end;*/ /* buffers */ hoedown_buffer *ib, *ob; @@ -161,6 +162,8 @@ main(int argc, char **argv) FILE *in = NULL; /* renderer */ + hoedown_renderer *renderer = NULL; + void (*renderer_free)(hoedown_renderer*) = NULL; int toc_level = 0; int renderer_type = RENDERER_HTML; @@ -201,6 +204,9 @@ main(int argc, char **argv) char opt; const char *val; for (j = 1; (opt = arg[j]); j++) { + long int num; + int isNum; + if (opt == 'h') { print_help(argv[0]); return 1; @@ -224,8 +230,7 @@ main(int argc, char **argv) return 1; } - long int num; - int isNum = parseint(val, &num); + isNum = parseint(val, &num); if (opt == 'n' && isNum) { max_nesting = num; @@ -414,9 +419,6 @@ main(int argc, char **argv) /* creating the renderer */ - hoedown_renderer *renderer = NULL; - void (*renderer_free)(hoedown_renderer*) = NULL; - switch (renderer_type) { case RENDERER_HTML: renderer = hoedown_html_renderer_new(html_flags, toc_level); @@ -437,9 +439,9 @@ main(int argc, char **argv) ob = hoedown_buffer_new(ounit); document = hoedown_document_new(renderer, extensions, max_nesting); - //clock_gettime(CLOCK_MONOTONIC, &start); + /*clock_gettime(CLOCK_MONOTONIC, &start);*/ hoedown_document_render(document, ob, ib->data, ib->size); - //clock_gettime(CLOCK_MONOTONIC, &end); + /*clock_gettime(CLOCK_MONOTONIC, &end);*/ /* writing the result to stdout */ @@ -448,13 +450,13 @@ main(int argc, char **argv) /* showing rendering time */ if (show_time) { - //TODO: enable this - //long long elapsed = ( end.tv_sec*1000000000 + end.tv_nsec) - // - (start.tv_sec*1000000000 + start.tv_nsec); - //if (elapsed < 1000000000) - // fprintf(stderr, "Time spent on rendering: %.2f ms.\n", ((double)elapsed)/1000000); - //else - // fprintf(stderr, "Time spent on rendering: %.3f s.\n", ((double)elapsed)/1000000000); + /*TODO: enable this + long long elapsed = (end.tv_sec - start.tv_sec)*1e9 + (end.tv_nsec - start.tv_nsec); + if (elapsed < 1e9) + fprintf(stderr, "Time spent on rendering: %.2f ms.\n", ((double)elapsed)/1e6); + else + fprintf(stderr, "Time spent on rendering: %.3f s.\n", ((double)elapsed)/1e9); + */ } diff --git a/bin/smartypants.c b/bin/smartypants.c index d67165a..e9beab0 100644 --- a/bin/smartypants.c +++ b/bin/smartypants.c @@ -1,7 +1,7 @@ #include "html.h" #include "common.h" -//#include <time.h> +/*#include <time.h>*/ #define DEF_IUNIT 1024 #define DEF_OUNIT 64 @@ -41,7 +41,7 @@ int main(int argc, char **argv) { int show_time = 0; - //struct timespec start, end; + /*struct timespec start, end;*/ /* buffers */ hoedown_buffer *ib, *ob; @@ -79,6 +79,8 @@ main(int argc, char **argv) char opt; const char *val; for (j = 1; (opt = arg[j]); j++) { + long int num; + int isNum; if (opt == 'h') { print_help(argv[0]); return 1; @@ -102,8 +104,7 @@ main(int argc, char **argv) return 1; } - long int num; - int isNum = parseint(val, &num); + isNum = parseint(val, &num); if (opt == 'i' && isNum) { iunit = num; @@ -200,9 +201,9 @@ main(int argc, char **argv) /* performing SmartyPants processing */ ob = hoedown_buffer_new(ounit); - //clock_gettime(CLOCK_MONOTONIC, &start); + /*clock_gettime(CLOCK_MONOTONIC, &start);*/ hoedown_html_smartypants(ob, ib->data, ib->size); - //clock_gettime(CLOCK_MONOTONIC, &end); + /*clock_gettime(CLOCK_MONOTONIC, &end);*/ /* writing the result to stdout */ @@ -211,13 +212,13 @@ main(int argc, char **argv) /* showing rendering time */ if (show_time) { - //TODO: enable this - //long long elapsed = ( end.tv_sec*1000000000 + end.tv_nsec) - // - (start.tv_sec*1000000000 + start.tv_nsec); - //if (elapsed < 1000000000) - // fprintf(stderr, "Time spent on rendering: %.2f ms.\n", ((double)elapsed)/1000000); - //else - // fprintf(stderr, "Time spent on rendering: %.3f s.\n", ((double)elapsed)/1000000000); + /*TODO: enable this + long long elapsed = (end.tv_sec - start.tv_sec)*1e9 + (end.tv_nsec - start.tv_nsec); + if (elapsed < 1e9) + fprintf(stderr, "Time spent on rendering: %.2f ms.\n", ((double)elapsed)/1e6); + else + fprintf(stderr, "Time spent on rendering: %.3f s.\n", ((double)elapsed)/1e9); + */ } |