Style fixes in libruntime.
This commit is contained in:
Ruben Ayrapetyan
+128
-95
@@ -19,23 +19,23 @@
|
||||
|
||||
#include "jerry-libc.h"
|
||||
|
||||
FIXME( #ifndef LIBC_MUSL should be removed from here when own libc will be implemented )
|
||||
FIXME(#ifndef LIBC_MUSL should be removed from here when own libc will be implemented)
|
||||
|
||||
#ifndef LIBC_MUSL
|
||||
/**
|
||||
* memcpy alias to __memcpy (for compiler usage)
|
||||
*/
|
||||
extern void *memcpy(void *s1, const void*s2, size_t n);
|
||||
extern void *memcpy (void *s1, const void*s2, size_t n);
|
||||
|
||||
/**
|
||||
* memset alias to __memset (for compiler usage)
|
||||
*/
|
||||
extern void *memset(void *s, int c, size_t n);
|
||||
extern void *memset (void *s, int c, size_t n);
|
||||
|
||||
/**
|
||||
* memmove alias to __memmove (for compiler usage)
|
||||
*/
|
||||
extern void *memmove(void *s1, const void*s2, size_t n);
|
||||
extern void *memmove (void *s1, const void*s2, size_t n);
|
||||
|
||||
#ifdef __GNUC__
|
||||
/*
|
||||
@@ -53,31 +53,31 @@ CALL_PRAGMA(GCC optimize ("-fno-tree-loop-distribute-patterns"))
|
||||
/**
|
||||
* memcpy alias to __memcpy (for compiler usage)
|
||||
*/
|
||||
void* memcpy(void *s1, /**< destination */
|
||||
const void* s2, /**< source */
|
||||
size_t n) /**< bytes number */
|
||||
void* memcpy (void *s1, /**< destination */
|
||||
const void* s2, /**< source */
|
||||
size_t n) /**< bytes number */
|
||||
{
|
||||
return __memcpy(s1, s2, n);
|
||||
return __memcpy (s1, s2, n);
|
||||
} /* memcpy */
|
||||
|
||||
/**
|
||||
* memset alias to __memset (for compiler usage)
|
||||
*/
|
||||
void* memset(void *s, /**< area to set values in */
|
||||
int c, /**< value to set */
|
||||
size_t n) /**< area size */
|
||||
void* memset (void *s, /**< area to set values in */
|
||||
int c, /**< value to set */
|
||||
size_t n) /**< area size */
|
||||
{
|
||||
return __memset(s, c, n);
|
||||
return __memset (s, c, n);
|
||||
} /* memset */
|
||||
|
||||
/**
|
||||
* memmove alias to __memmove (for compiler usage)
|
||||
*/
|
||||
void* memmove(void *s1, /**< destination*/
|
||||
const void*s2, /**< source */
|
||||
size_t n) /**< area size */
|
||||
void* memmove (void *s1, /**< destination*/
|
||||
const void*s2, /**< source */
|
||||
size_t n) /**< area size */
|
||||
{
|
||||
return __memmove(s1, s2, n);
|
||||
return __memmove (s1, s2, n);
|
||||
} /* memmove */
|
||||
|
||||
#ifdef __GNUC__
|
||||
@@ -89,65 +89,66 @@ CALL_PRAGMA(GCC diagnostic pop)
|
||||
|
||||
/**
|
||||
* memset
|
||||
*
|
||||
*
|
||||
* @return @s
|
||||
*/
|
||||
void*
|
||||
__memset(void *s, /**< area to set values in */
|
||||
int c, /**< value to set */
|
||||
size_t n) /**< area size */
|
||||
__memset (void *s, /**< area to set values in */
|
||||
int c, /**< value to set */
|
||||
size_t n) /**< area size */
|
||||
{
|
||||
uint8_t *area_p = s;
|
||||
for ( size_t index = 0; index < n; index++ )
|
||||
{
|
||||
area_p[ index ] = (uint8_t)c;
|
||||
}
|
||||
|
||||
return s;
|
||||
uint8_t *area_p = s;
|
||||
for (size_t index = 0; index < n; index++)
|
||||
{
|
||||
area_p[ index ] = (uint8_t)c;
|
||||
}
|
||||
|
||||
return s;
|
||||
} /* __memset */
|
||||
|
||||
/**
|
||||
* memcmp
|
||||
*
|
||||
*
|
||||
* @return 0, if areas are equal;
|
||||
* -1, if first area's content is lexicographically less, than second area's content;
|
||||
* 1, otherwise
|
||||
*/
|
||||
int
|
||||
__memcmp(const void *s1, /**< first area */
|
||||
const void *s2, /**< second area */
|
||||
size_t n) /**< area size */
|
||||
__memcmp (const void *s1, /**< first area */
|
||||
const void *s2, /**< second area */
|
||||
size_t n) /**< area size */
|
||||
{
|
||||
const uint8_t *area1_p = s1, *area2_p = s2;
|
||||
for ( size_t index = 0; index < n; index++ )
|
||||
const uint8_t *area1_p = s1, *area2_p = s2;
|
||||
for (size_t index = 0; index < n; index++)
|
||||
{
|
||||
if (area1_p[ index ] < area2_p[ index ])
|
||||
{
|
||||
if ( area1_p[ index ] < area2_p[ index ] )
|
||||
{
|
||||
return -1;
|
||||
} else if ( area1_p[ index ] > area2_p[ index ] )
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
else if (area1_p[ index ] > area2_p[ index ])
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
} /* __memcmp */
|
||||
|
||||
/**
|
||||
* memcpy
|
||||
*/
|
||||
void *
|
||||
__memcpy(void *s1, /**< destination */
|
||||
const void *s2, /**< source */
|
||||
size_t n) /**< bytes number */
|
||||
__memcpy (void *s1, /**< destination */
|
||||
const void *s2, /**< source */
|
||||
size_t n) /**< bytes number */
|
||||
{
|
||||
uint8_t *area1_p = s1;
|
||||
const uint8_t *area2_p = s2;
|
||||
|
||||
for ( size_t index = 0; index < n; index++ )
|
||||
{
|
||||
area1_p[ index ] = area2_p[ index ];
|
||||
}
|
||||
uint8_t *area1_p = s1;
|
||||
const uint8_t *area2_p = s2;
|
||||
|
||||
for (size_t index = 0; index < n; index++)
|
||||
{
|
||||
area1_p[ index ] = area2_p[ index ];
|
||||
}
|
||||
|
||||
return s1;
|
||||
} /* __memcpy */
|
||||
@@ -158,102 +159,127 @@ __memcpy(void *s1, /**< destination */
|
||||
* @return the dest pointer's value
|
||||
*/
|
||||
void *
|
||||
__memmove(void *s1, /**< destination */
|
||||
const void *s2, /**< source */
|
||||
size_t n) /**< bytes number */
|
||||
__memmove (void *s1, /**< destination */
|
||||
const void *s2, /**< source */
|
||||
size_t n) /**< bytes number */
|
||||
{
|
||||
uint8_t *dest_p = s1;
|
||||
const uint8_t *src_p = s2;
|
||||
|
||||
if ( dest_p < src_p )
|
||||
if (dest_p < src_p)
|
||||
{ /* from begin to end */
|
||||
for ( size_t index = 0; index < n; index++ )
|
||||
for (size_t index = 0; index < n; index++)
|
||||
{
|
||||
dest_p[ index ] = src_p[ index ];
|
||||
dest_p[ index ] = src_p[ index ];
|
||||
}
|
||||
} else if ( dest_p > src_p )
|
||||
}
|
||||
else if (dest_p > src_p)
|
||||
{ /* from end to begin */
|
||||
for ( size_t index = 1; index <= n; index++ )
|
||||
for (size_t index = 1; index <= n; index++)
|
||||
{
|
||||
dest_p[ n - index ] = src_p[ n - index ];
|
||||
dest_p[ n - index ] = src_p[ n - index ];
|
||||
}
|
||||
}
|
||||
|
||||
return s1;
|
||||
} /* __memmove */
|
||||
|
||||
/** Compare two strings. return an integer less than, equal to, or greater than zero
|
||||
if s1 is found, respectively, to be less than, to match, or be greater than s2. */
|
||||
/** Compare two strings. return an integer less than, equal to, or greater than zero
|
||||
if s1 is found, respectively, to be less than, to match, or be greater than s2. */
|
||||
int
|
||||
__strcmp (const char *s1, const char *s2)
|
||||
{
|
||||
size_t i;
|
||||
if (s1 == NULL)
|
||||
{
|
||||
if (s2 != NULL)
|
||||
{
|
||||
if (s2 != NULL)
|
||||
return -1;
|
||||
else
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (s2 == NULL)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (i = 0; s1[i]; i++)
|
||||
{
|
||||
if (s1[i] > s2[i])
|
||||
{
|
||||
if (s1[i] > s2[i])
|
||||
return 1;
|
||||
else if (s1[i] < s2[i])
|
||||
return -1;
|
||||
return 1;
|
||||
}
|
||||
else if (s1[i] < s2[i])
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (s2[i])
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Compare two strings. return an integer less than, equal to, or greater than zero
|
||||
if the first n character of s1 is found, respectively, to be less than, to match,
|
||||
or be greater than the first n character of s2. */
|
||||
/** Compare two strings. return an integer less than, equal to, or greater than zero
|
||||
if the first n character of s1 is found, respectively, to be less than, to match,
|
||||
or be greater than the first n character of s2. */
|
||||
int
|
||||
__strncmp (const char *s1, const char *s2, size_t n)
|
||||
{
|
||||
size_t i;
|
||||
if (s1 == NULL)
|
||||
{
|
||||
if (s2 != NULL)
|
||||
{
|
||||
if (s2 != NULL)
|
||||
return -1;
|
||||
else
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (s2 == NULL)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
{
|
||||
if (s1[i] > s2[i])
|
||||
{
|
||||
if (s1[i] > s2[i])
|
||||
return 1;
|
||||
else if (s1[i] < s2[i])
|
||||
return -1;
|
||||
return 1;
|
||||
}
|
||||
else if (s1[i] < s2[i])
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Copy a string. At most n bytes of src are copied. Warning: If there is no
|
||||
null byte among the first n bytes of src, the string placed in dest will not be null-terminated.
|
||||
@return a pointer to the destination string dest. */
|
||||
null byte among the first n bytes of src, the string placed in dest will not be null-terminated.
|
||||
@return a pointer to the destination string dest. */
|
||||
char *
|
||||
__strncpy(char *dest, const char *src, size_t n)
|
||||
__strncpy (char *dest, const char *src, size_t n)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
{
|
||||
dest[i] = src[i];
|
||||
if (src[i] == '\0')
|
||||
{
|
||||
dest[i] = src[i];
|
||||
if (src[i] == '\0')
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return dest;
|
||||
}
|
||||
@@ -274,13 +300,16 @@ __strlen (const char *s)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; s[i]; i++)
|
||||
{
|
||||
;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
/** Checks for white-space characters. In the "C" and "POSIX" locales, these are: space,
|
||||
form-feed ('\f'), newline ('\n'), carriage return ('\r'), horizontal tab ('\t'), and vertical tab ('\v'). */
|
||||
int
|
||||
/** Checks for white-space characters. In the "C" and "POSIX" locales, these are: space,
|
||||
form-feed ('\f'), newline ('\n'), carriage return ('\r'), horizontal tab ('\t'), and vertical tab ('\v'). */
|
||||
int
|
||||
__isspace (int c)
|
||||
{
|
||||
switch (c)
|
||||
@@ -291,9 +320,13 @@ __isspace (int c)
|
||||
case '\r':
|
||||
case '\t':
|
||||
case '\v':
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
default:
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -301,7 +334,7 @@ __isspace (int c)
|
||||
int
|
||||
__isupper (int c)
|
||||
{
|
||||
return c >= 'A' && c <= 'Z';
|
||||
return c >= 'A' && c <= 'Z';
|
||||
}
|
||||
|
||||
/** Checks for an lowercase letter. */
|
||||
@@ -311,8 +344,8 @@ __islower (int c)
|
||||
return c >= 'a' && c <= 'z';
|
||||
}
|
||||
|
||||
/** Checks for an alphabetic character.
|
||||
In the standard "C" locale, it is equivalent to (isupper(c) || islower(c)). */
|
||||
/** Checks for an alphabetic character.
|
||||
In the standard "C" locale, it is equivalent to (isupper (c) || islower (c)). */
|
||||
int
|
||||
__isalpha (int c)
|
||||
{
|
||||
@@ -327,7 +360,7 @@ __isdigit (int c)
|
||||
}
|
||||
|
||||
/** checks for a hexadecimal digits, that is, one of
|
||||
0 1 2 3 4 5 6 7 8 9 a b c d e f A B C D E F. */
|
||||
0 1 2 3 4 5 6 7 8 9 a b c d e f A B C D E F. */
|
||||
int
|
||||
__isxdigit (int c)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user