summaryrefslogtreecommitdiff
path: root/libgcompat/string.c
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-01-14 18:28:35 -0600
committerSamuel Holland <samuel@sholland.org>2018-01-14 18:28:35 -0600
commitd40369b0e09e4e2228ebff305067ec2d99220848 (patch)
tree0839bc088f3f0b577e0badddab745fa9f3c94dd4 /libgcompat/string.c
parent28748009c0dc553e2fe5e6253e7615cf89d2b7ef (diff)
downloadgcompat-d40369b0e09e4e2228ebff305067ec2d99220848.tar.gz
gcompat-d40369b0e09e4e2228ebff305067ec2d99220848.tar.bz2
gcompat-d40369b0e09e4e2228ebff305067ec2d99220848.tar.xz
gcompat-d40369b0e09e4e2228ebff305067ec2d99220848.zip
global: Format the code consistently
* Apply clang-format. * Change all comments to the same style. * Add braces as dictated by the coding style guidelines. Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'libgcompat/string.c')
-rw-r--r--libgcompat/string.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/libgcompat/string.c b/libgcompat/string.c
index 9045d5d..60f61fc 100644
--- a/libgcompat/string.c
+++ b/libgcompat/string.c
@@ -1,6 +1,6 @@
-#include <assert.h> /* assert */
-#include <string.h> /* memcpy, strcpy, strncat, strndup */
-#include <stdlib.h> /* strto[u?]ll */
+#include <assert.h> /* assert */
+#include <stdlib.h> /* strto[u?]ll */
+#include <string.h> /* memcpy, strcpy, strncat, strndup */
/* "Checked" memcpy */
void *__memcpy_chk(void *dest, const void *src, size_t len, size_t destlen)
@@ -8,8 +8,7 @@ void *__memcpy_chk(void *dest, const void *src, size_t len, size_t destlen)
assert(dest != NULL);
assert(src != NULL);
assert(len <= destlen);
- if(src < dest)
- {
+ if (src < dest) {
assert(!(src + len >= dest));
} else {
assert(!(dest + len >= src));
@@ -64,12 +63,14 @@ char *__strndup(const char *str, size_t count)
void *rawmemchr(const void *s, int c)
{
const unsigned char *haystack = s;
- unsigned char needle = (unsigned char)c;
- while(*haystack++ != needle);
- return (void *)haystack;
+ unsigned char needle = (unsigned char) c;
+ while (*haystack++ != needle)
+ ;
+ return (void *) haystack;
}
-extern __typeof(rawmemchr) __rawmemchr __attribute__((weak, alias("rawmemchr")));
+extern __typeof(rawmemchr) __rawmemchr
+ __attribute__((weak, alias("rawmemchr")));
/* Another useless __ alias */
char *__strtok_r(char *str, const char *delim, char **saveptr)
@@ -85,12 +86,14 @@ char *__strsep_g(char **stringp, const char *delim)
}
/* Some day, when musl supports LC_NUMERIC, we can probably remove these */
-long long int strtoll_l(const char *nptr, char **endptr, int base, locale_t locale)
+long long int strtoll_l(const char *nptr, char **endptr, int base,
+ locale_t locale)
{
return strtoll(nptr, endptr, base);
}
-unsigned long long int strtoull_l(const char *nptr, char **endptr, int base, locale_t locale)
+unsigned long long int strtoull_l(const char *nptr, char **endptr, int base,
+ locale_t locale)
{
return strtoull(nptr, endptr, base);
}