miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Adrien Gallouët
2017-01-04 14:24:30 +00:00
parent c591a4d3cc
commit 8c8715187b
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/str.h
View File

@@ -2,14 +2,15 @@
#include "common.h"
static inline size_t str_cpy (char *restrict dst, const char *restrict src, size_t len)
static inline size_t
str_cpy(char *restrict dst, const char *restrict src, size_t len)
{
if (!dst || !src)
return 0;
size_t i;
for (i=0; i<len && src[i]; i++)
for (i = 0; i < len && src[i]; i++)
dst[i] = src[i];
dst[i] = 0;
@@ -17,29 +18,29 @@ static inline size_t str_cpy (char *restrict dst, const char *restrict src, size
return i;
}
_pure_
static inline int str_empty (const char *restrict str)
_pure_ static inline int
str_empty(const char *restrict str)
{
return !str || !str[0];
}
_pure_
static inline size_t str_cmp (const char *restrict sa, const char *restrict sb)
_pure_ static inline size_t
str_cmp(const char *restrict sa, const char *restrict sb)
{
if (!sa || !sb)
return 1;
size_t i = 0;
while (sa[i]==sb[i])
while (sa[i] == sb[i])
if (!sa[i++])
return 0;
return i+1;
return i + 1;
}
_pure_
static inline size_t str_len (const char *restrict str)
_pure_ static inline size_t
str_len(const char *restrict str)
{
if (!str)
return 0;
@@ -47,11 +48,12 @@ static inline size_t str_len (const char *restrict str)
return strlen(str);
}
static inline char *str_cat (const char **strs, size_t count)
static inline char *
str_cat(const char **strs, size_t count)
{
size_t size = 1;
for (size_t i=0; i<count; i++)
for (size_t i = 0; i < count; i++)
size += str_len(strs[i]);
char *str = malloc(size);
@@ -61,7 +63,7 @@ static inline char *str_cat (const char **strs, size_t count)
char *p = str;
for (size_t i=0; i<count; i++) {
for (size_t i = 0; i < count; i++) {
size_t len = str_len(strs[i]);
memcpy(p, strs[i], len);
p += len;