1.1 --- a/ucx/string.c Thu Oct 11 11:42:31 2012 +0200
1.2 +++ b/ucx/string.c Thu Oct 11 16:29:30 2012 +0200
1.3 @@ -11,21 +11,21 @@
1.4
1.5 #include "string.h"
1.6
1.7 -sstr_t sstr (char *s) {
1.8 +sstr_t sstr(char *s) {
1.9 sstr_t string;
1.10 string.ptr = s;
1.11 string.length = strlen(s);
1.12 return string;
1.13 }
1.14
1.15 -sstr_t sstrn (char *s, size_t n) {
1.16 +sstr_t sstrn(char *s, size_t n) {
1.17 sstr_t string;
1.18 string.ptr = s;
1.19 string.length = n;
1.20 return string;
1.21 }
1.22
1.23 -size_t sstrnlen (size_t n, const sstr_t s, ...) {
1.24 +size_t sstrnlen(size_t n, sstr_t s, ...) {
1.25 va_list ap;
1.26 size_t size = s.length;
1.27 va_start(ap, s);
1.28 @@ -39,7 +39,7 @@
1.29 return size;
1.30 }
1.31
1.32 -sstr_t sstrcat (sstr_t s, ...) {
1.33 +sstr_t sstrcat(sstr_t s, ...) {
1.34 va_list ap;
1.35 va_start(ap, s);
1.36 s.ptr[0] = 0;
1.37 @@ -54,7 +54,7 @@
1.38 return s;
1.39 }
1.40
1.41 -sstr_t sstrncat (size_t n, sstr_t s, const sstr_t c1, ...) {
1.42 +sstr_t sstrncat(size_t n, sstr_t s, sstr_t c1, ...) {
1.43 va_list ap;
1.44 va_start(ap, c1);
1.45 s.ptr[0] = 0;
1.46 @@ -82,11 +82,11 @@
1.47 return s;
1.48 }
1.49
1.50 -sstr_t sstrsubs (const sstr_t s, size_t start) {
1.51 +sstr_t sstrsubs(sstr_t s, size_t start) {
1.52 return sstrsubsl (s, start, s.length-start);
1.53 }
1.54
1.55 -sstr_t sstrsubsl (const sstr_t s, size_t start, size_t length) {
1.56 +sstr_t sstrsubsl(sstr_t s, size_t start, size_t length) {
1.57 sstr_t new_sstr;
1.58 if (start < 0 || start >= s.length || length < 0) {
1.59 return s;
1.60 @@ -99,7 +99,7 @@
1.61 return new_sstr;
1.62 }
1.63
1.64 -sstr_t* sstrsplit(const sstr_t s, const sstr_t d, size_t *n) {
1.65 +sstr_t* sstrsplit(sstr_t s, sstr_t d, size_t *n) {
1.66 if (d.length == 0) {
1.67 return NULL;
1.68 }
1.69 @@ -155,11 +155,11 @@
1.70 return result;
1.71 }
1.72
1.73 -int sstrcmp(const sstr_t s1, const sstr_t s2) {
1.74 +int sstrcmp(sstr_t s1, sstr_t s2) {
1.75 return strncmp(s1.ptr, s2.ptr, s1.length>s2.length ? s2.length: s1.length);
1.76 }
1.77
1.78 -sstr_t sstrdup(const sstr_t s) {
1.79 +sstr_t sstrdup(sstr_t s) {
1.80 sstr_t newstring;
1.81 newstring.ptr = (char*) malloc(s.length + 1);
1.82 if (newstring.ptr != NULL) {
