ucx/string.c

changeset 95
ecfdc1c4a552
parent 87
bd444539cced
child 96
fbbff331beba
     1.1 --- a/ucx/string.c	Wed Feb 27 11:48:29 2013 +0100
     1.2 +++ b/ucx/string.c	Wed Feb 27 13:30:21 2013 +0100
     1.3 @@ -30,7 +30,7 @@
     1.4      size_t size = s.length;
     1.5      va_start(ap, s);
     1.6  
     1.7 -    for (int i=0;i<n-1;i++) {
     1.8 +    for (size_t i = 0 ; i < n-1 ; i++) {
     1.9          sstr_t str = va_arg(ap, sstr_t);
    1.10          size += str.length;
    1.11      }
    1.12 @@ -66,7 +66,7 @@
    1.13      memcpy(ptr, c1.ptr, cplen);
    1.14      len -= cplen;
    1.15      ptr += cplen;
    1.16 -    for (int i=0;i<n-1;i++) {
    1.17 +    for (size_t i = 0 ; i < n-1 ; i++) {
    1.18          sstr_t str = va_arg (ap, sstr_t);
    1.19          cplen = str.length > len ? len : str.length;
    1.20          if(cplen <= 0) {
    1.21 @@ -115,10 +115,10 @@
    1.22      }
    1.23      sstr_t sv = sstrdup(s);
    1.24  
    1.25 -    for (int i = 0 ; i < s.length ; i++) {
    1.26 +    for (size_t i = 0 ; i < s.length ; i++) {
    1.27          if (sv.ptr[i] == d.ptr[0]) {
    1.28              _Bool match = 1;
    1.29 -            for (int j = 1 ; j < d.length ; j++) {
    1.30 +            for (size_t j = 1 ; j < d.length ; j++) {
    1.31                  if (j+i < s.length) {
    1.32                      match &= (sv.ptr[i+j] == d.ptr[j]);
    1.33                  } else {
    1.34 @@ -128,7 +128,7 @@
    1.35              }
    1.36              if (match) {
    1.37                  (*n)++;
    1.38 -                for (int j = 0 ; j < d.length ; j++) {
    1.39 +                for (size_t j = 0 ; j < d.length ; j++) {
    1.40                      sv.ptr[i+j] = 0;
    1.41                  }
    1.42                  i += d.length;
    1.43 @@ -139,7 +139,7 @@
    1.44      result = (sstr_t*) malloc(sizeof(sstr_t) * (*n));
    1.45  
    1.46      char *pptr = sv.ptr;
    1.47 -    for (int i = 0 ; i < *n ; i++) {
    1.48 +    for (size_t i = 0 ; i < *n ; i++) {
    1.49          size_t l = strlen(pptr);
    1.50          char* ptr = (char*) malloc(l + 1);
    1.51          memcpy(ptr, pptr, l);

mercurial