Mercurial > hg > c2html / file diff

     1.1 --- a/src/highlighter.c	Wed Aug 31 12:58:48 2016 +0200
     1.2 +++ b/src/highlighter.c	Wed Aug 31 14:41:56 2016 +0200
     1.3 @@ -29,23 +29,12 @@
     1.4  
     1.5  #include "highlighter.h"
     1.6  
     1.7 -HighlighterData* new_highlighter_data() {
     1.8 -    HighlighterData* hd = malloc(sizeof(HighlighterData));
     1.9 -    if (hd == NULL) {
    1.10 -        return NULL;
    1.11 -    } else {
    1.12 -        hd->multiline_comment = 0;
    1.13 -        hd->primary_buffer = ucx_buffer_new(NULL, 256, UCX_BUFFER_AUTOEXTEND);
    1.14 -        hd->secondary_buffer = ucx_buffer_new(NULL, 32, UCX_BUFFER_AUTOEXTEND);
    1.15 -        return hd;
    1.16 -    }
    1.17 -}
    1.18 -
    1.19 -void free_highlighter_data(HighlighterData *hd) {
    1.20 -    ucx_buffer_free(hd->primary_buffer);
    1.21 -    ucx_buffer_free(hd->secondary_buffer);
    1.22 -    free(hd);
    1.23 -}
    1.24 +#include <stdlib.h>
    1.25 +#include <stdio.h>
    1.26 +#include <string.h>
    1.27 +#include <ctype.h>
    1.28 +#include "ucx/string.h"
    1.29 +#include "ucx/utils.h"
    1.30  
    1.31  static void put_htmlescaped(UcxBuffer *dest, char c) {
    1.32      if (c == '>') {
    1.33 @@ -84,7 +73,7 @@
    1.34  
    1.35  /* Plaintext Highlighter */
    1.36  
    1.37 -void plain_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) {
    1.38 +void c2html_plain_highlighter(char *src, UcxBuffer *dest, c2html_highlighter_data *hd) {
    1.39      while (*src && *src != '\n') {
    1.40          put_htmlescaped(dest, *src);
    1.41          src++;
    1.42 @@ -102,7 +91,7 @@
    1.43      "while", NULL
    1.44  };
    1.45  
    1.46 -void c_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) {
    1.47 +void c2html_c_highlighter(char *src, UcxBuffer *dest, c2html_highlighter_data *hd) {
    1.48      /* reset buffers without clearing them */
    1.49      hd->primary_buffer->size = hd->primary_buffer->pos = 0;
    1.50      hd->secondary_buffer->size = hd->secondary_buffer->pos = 0;
    1.51 @@ -245,7 +234,7 @@
    1.52      "volatile", "const", "float", "native", "super", "while", NULL
    1.53  };
    1.54  
    1.55 -void java_highlighter(char *src, UcxBuffer *dest, HighlighterData *hd) {
    1.56 +void c2html_java_highlighter(char *src, UcxBuffer *dest, c2html_highlighter_data *hd) {
    1.57      /* reset buffers without clearing them */
    1.58      hd->primary_buffer->size = hd->primary_buffer->pos = 0;
    1.59      hd->secondary_buffer->size = hd->secondary_buffer->pos = 0;