Move the code from strings.h to a C file. We should really avoid
to have code in header files. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@518 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
parent
e04ac72e78
commit
5ff0fdb354
3 changed files with 130 additions and 102 deletions
108
include/string.h
108
include/string.h
|
|
@ -23,111 +23,19 @@
|
|||
|
||||
#include <types.h>
|
||||
|
||||
/* Prototypes for functions from lib/mem.c. */
|
||||
/* lib/string.c */
|
||||
size_t strnlen(const char *str, size_t maxlen);
|
||||
size_t strlen(const char *str);
|
||||
int strcmp(const char *s1, const char *s2);
|
||||
int strncmp(const char *s1, const char *s2, int maxlen);
|
||||
|
||||
/* lib/mem.c */
|
||||
void *memcpy(void *dest, const void *src, size_t len);
|
||||
void *memmove(void *dest, const void *src, size_t len);
|
||||
void *memset(void *s, int c, size_t len);
|
||||
int memcmp(const void *s1, const void *s2, size_t len);
|
||||
|
||||
/* Prototypes for functions from console/vsprintf.c. */
|
||||
/* console/vsprintf.c */
|
||||
int sprintf(char *buf, const char *fmt, ...);
|
||||
|
||||
/**
|
||||
* Calculate the length of a fixed-size string.
|
||||
*
|
||||
* @param str The input string.
|
||||
* @param maxlen Return at most maxlen characters as length of the string.
|
||||
* @return The length of the string, not including the final NUL character.
|
||||
* The maximum length returned is maxlen.
|
||||
*/
|
||||
static inline size_t strnlen(const char *str, size_t maxlen)
|
||||
{
|
||||
size_t len = 0;
|
||||
|
||||
/* NULL and empty strings have length 0. */
|
||||
if (!str)
|
||||
return 0;
|
||||
|
||||
/* Loop until we find a NUL character, or maxlen is reached. */
|
||||
while ((*str++ != '\0') && (len < maxlen))
|
||||
len++;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate the length of a string.
|
||||
*
|
||||
* @param str The input string.
|
||||
* @return The length of the string, not including the final NUL character.
|
||||
*/
|
||||
static inline size_t strlen(const char *str)
|
||||
{
|
||||
size_t len = 0;
|
||||
|
||||
/* NULL and empty strings have length 0. */
|
||||
if (!str)
|
||||
return 0;
|
||||
|
||||
/* Loop until we find a NUL character. */
|
||||
while (*str++ != '\0')
|
||||
len++;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare two strings.
|
||||
*
|
||||
* @param s1 The first string.
|
||||
* @param s2 The second string.
|
||||
* @return Returns a value less than zero, if s1 is shorter than s2. Returns
|
||||
* zero, if s1 equals s2. Returns a value greater than zero, if
|
||||
* s1 is longer than s2.
|
||||
*/
|
||||
static inline int strcmp(const char *s1, const char *s2)
|
||||
{
|
||||
char c1, c2;
|
||||
|
||||
/* Set c1 == c2, so that we can enter the while loop. */
|
||||
c1 = 0;
|
||||
c2 = 0;
|
||||
|
||||
/* Compare characters until they differ, or one of the strings ends. */
|
||||
while (c1 == c2) {
|
||||
/* Read the next character from each string. */
|
||||
c1 = *s1++;
|
||||
c2 = *s2++;
|
||||
|
||||
/* Return something negative (if s1 is shorter than s2), or
|
||||
zero (if s1 equals s2). */
|
||||
if (c1 == '\0')
|
||||
return c1 - c2;
|
||||
}
|
||||
|
||||
/* Return someting positive (if s1 is longer than s2), or zero (if s1
|
||||
and s2 are equal). */
|
||||
return c1 - c2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare two strings with fixed length.
|
||||
*
|
||||
* @param s1 The first string.
|
||||
* @param s2 The second string.
|
||||
* @param maxlen Return at most maxlen characters as length of the string.
|
||||
* @return A non-zero value if s1 and s2 differ, or zero if s1 equals s2.
|
||||
*/
|
||||
static inline int strncmp(const char *s1, const char *s2, int maxlen)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < maxlen; i++) {
|
||||
if (s1[i] != s2[i])
|
||||
return s1[i] - s2[i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* STRING_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue