Chameleon Commit Details - 2319 - Chameleon open source boot loader project.

Date:

2014-01-08 05:40:24 (10 years 3 months ago)

Author:

Chuck Fry

Commit:

2319

Parents:

2318

Message:

Merged against trunk r2318

Changes:

M	/branches/chucko
M	/branches/chucko/i386/config/lex.zconf.c

File differences

-820
821 821
822 822
823
823 824
824 
825 825
826 826
827 827
828 828
829 
829
830 830
831 831
832 832
+␊
static void append_string(const char *str, int size)␊
{␊
    int new_size = text_size + size + 1;␊
␉if (new_size > text_asize) {␊
      int new_size = text_size + size + 1;␊
      char* new_text = NULL;␊
      new_size += START_STRSIZE - 1;␊
      new_size &= -START_STRSIZE;␊
      if (!(new_text = realloc(text, new_size)))␊
        return;␊
␉␉return;␊
      text = new_text;␊
      text_asize = new_size;␊
␉}␊␊
 ␊
 static void append_string(const char *str, int size)␊
 {␊
+    int new_size = text_size + size + 1;␊
 ␉if (new_size > text_asize) {␊
-      int new_size = text_size + size + 1;␊
       char* new_text = NULL;␊
       new_size += START_STRSIZE - 1;␊
       new_size &= -START_STRSIZE;␊
       if (!(new_text = realloc(text, new_size)))␊
-        return;␊
+␉␉return;␊
       text = new_text;␊
       text_asize = new_size;␊
 ␉}␊␊