Changeset 8565a42 in mainline for uspace/lib/posix/src/string.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/lib/posix/src/string.c (modified) (17 diffs)

uspace/lib/posix/src/string.c

@@ -62 +62 @@
                 ++s1;
         }
-        
+
         return (char *) s1;
 }
@@ -107 +107 @@
         for (size_t i = 0; ; ++i) {
                 dest[i] = src[i];
-                
+
                 if (src[i] == '\0') {
                         /* pointer to the terminating nul character */
@@ -113 +113 @@
                 }
         }
-        
+
         /* unreachable */
         return NULL;
@@ -133 +133 @@
         for (size_t i = 0; i < n; ++i) {
                 dest[i] = src[i];
-        
+
                 /* the standard requires that nul characters
                  * are appended to the length of n, in case src is shorter
@@ -145 +145 @@
                 }
         }
-        
+
         return &dest[n];
 }
@@ -197 +197 @@
         assert(dest != NULL);
         assert(src != NULL);
-        
+
         unsigned char* bdest = dest;
         const unsigned char* bsrc = src;
-        
+
         for (size_t i = 0; i < n; ++i) {
                 bdest[i] = bsrc[i];
-        
+
                 if (bsrc[i] == (unsigned char) c) {
                         /* pointer to the next byte */
@@ -209 +209 @@
                 }
         }
-        
+
         return NULL;
 }
@@ -301 +301 @@
 {
         assert(mem != NULL);
-        
+
         const unsigned char *s = mem;
-        
+
         for (size_t i = 0; i < n; ++i) {
                 if (s[i] == (unsigned char) c) {
@@ -323 +323 @@
 {
         assert(s != NULL);
-        
+
         char *res = gnu_strchrnul(s, c);
         return (*res == c) ? res : NULL;
@@ -339 +339 @@
 {
         assert(s != NULL);
-        
+
         const char *ptr = strchr(s, '\0');
-        
+
         /* the same as in strchr, except it loops in reverse direction */
         while (*ptr != (char) c) {
@@ -365 +365 @@
 {
         assert(s != NULL);
-        
+
         while (*s != c && *s != '\0') {
                 s++;
         }
-        
+
         return (char *) s;
 }
@@ -439 +439 @@
         assert(haystack != NULL);
         assert(needle != NULL);
-        
+
         /* Special case - needle is an empty string. */
         if (needle[0] == '\0') {
                 return (char *) haystack;
         }
-        
+
         /* Preprocess needle. */
         size_t nlen = strlen(needle);
         size_t prefix_table[nlen + 1];
-        
+
         {
                 size_t i = 0;
                 ssize_t j = -1;
-                
+
                 prefix_table[i] = j;
-                
+
                 while (i < nlen) {
                         while (j >= 0 && needle[i] != needle[j]) {
@@ -463 +463 @@
                 }
         }
-        
+
         /* Search needle using the precomputed table. */
         size_t npos = 0;
-        
+
         for (size_t hpos = 0; haystack[hpos] != '\0'; ++hpos) {
                 while (npos != 0 && haystack[hpos] != needle[npos]) {
                         npos = prefix_table[npos];
                 }
-                
+
                 if (haystack[hpos] == needle[npos]) {
                         npos++;
-                        
+
                         if (npos == nlen) {
                                 return (char *) (haystack + hpos - nlen + 1);
@@ -480 +480 @@
                 }
         }
-        
+
         return NULL;
 }
@@ -604 +604 @@
 {
         assert(buf != NULL);
-        
+
         char *errstr = strerror(errnum);
-        
+
         if (strlen(errstr) + 1 > bufsz) {
                 return ERANGE;
@@ -625 +625 @@
 {
         assert(s != NULL);
-        
+
         return (size_t) (strchr(s, '\0') - s);
 }
@@ -639 +639 @@
 {
         assert(s != NULL);
-        
+
         for (size_t sz = 0; sz < n; ++sz) {
-                
+
                 if (s[sz] == '\0') {
                         return sz;
                 }
         }
-        
+
         return n;
 }