Commit 4661abc7 authored by Antonio Nino Diaz's avatar Antonio Nino Diaz
Browse files

libc: Cleanup remaining files


The existing files had some style problems that this patch fixes.

Change-Id: I794e0d96e52f8da0ffa0d70a41f36c4432b4e563
Signed-off-by: default avatarAntonio Nino Diaz <antonio.ninodiaz@arm.com>
parent 7addcb33
Showing with 123 additions and 19 deletions
+123 -19
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
#include <debug.h> #include <debug.h>
#include <stdlib.h> #include <stdlib.h>
/* void abort(void)
* This is a basic implementation. This could be improved.
*/
void abort (void)
{ {
ERROR("ABORT\n"); ERROR("ABORT\n");
panic(); panic();
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#include <platform.h> #include <platform.h>
/* /*
* Only print the output if PLAT_LOG_LEVEL_ASSERT is higher or equal to * Only print the output if PLAT_LOG_LEVEL_ASSERT is higher or equal to
* LOG_LEVEL_INFO, which is the default value for builds with DEBUG=1. * LOG_LEVEL_INFO, which is the default value for builds with DEBUG=1.
*/ */
#if PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_VERBOSE #if PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_VERBOSE
void __assert(const char *file, unsigned int line, const char *assertion) void __assert(const char *file, unsigned int line, const char *assertion)
......
...@@ -8,7 +8,11 @@ LIBC_SRCS := $(addprefix lib/libc/, \ ...@@ -8,7 +8,11 @@ LIBC_SRCS := $(addprefix lib/libc/, \
abort.c \ abort.c \
assert.c \ assert.c \
exit.c \ exit.c \
mem.c \ memchr.c \
memcmp.c \
memcpy.c \
memmove.c \
memset.c \
printf.c \ printf.c \
putchar.c \ putchar.c \
puts.c \ puts.c \
......
/*
* Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <stddef.h>
void *memchr(const void *src, int c, size_t len)
{
const char *s = src;
while (len--) {
if (*s == c)
return (void *) s;
s++;
}
return NULL;
}
/*
* Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <stddef.h>
int memcmp(const void *s1, const void *s2, size_t len)
{
const unsigned char *s = s1;
const unsigned char *d = s2;
unsigned char sc;
unsigned char dc;
while (len--) {
sc = *s++;
dc = *d++;
if (sc - dc)
return (sc - dc);
}
return 0;
}
/*
* Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <stddef.h>
void *memcpy(void *dst, const void *src, size_t len)
{
const char *s = src;
char *d = dst;
while (len--)
*d++ = *s++;
return dst;
}
/* /*
* Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <stddef.h> /* size_t */ #include <string.h>
/*
* Fill @count bytes of memory pointed to by @dst with @val
*/
void *memset(void *dst, int val, size_t count)
{
char *ptr = dst;
while (count--)
*ptr++ = val;
return dst;
}
/*
* Compare @len bytes of @s1 and @s2
*/
int memcmp(const void *s1, const void *s2, size_t len)
{
const unsigned char *s = s1;
const unsigned char *d = s2;
unsigned char sc;
unsigned char dc;
while (len--) {
sc = *s++;
dc = *d++;
if (sc - dc)
return (sc - dc);
}
return 0;
}
/*
* Copy @len bytes from @src to @dst
*/
void *memcpy(void *dst, const void *src, size_t len)
{
const char *s = src;
char *d = dst;
while (len--)
*d++ = *s++;
return dst;
}
/*
* Move @len bytes from @src to @dst
*/
void *memmove(void *dst, const void *src, size_t len) void *memmove(void *dst, const void *src, size_t len)
{ {
/* /*
...@@ -79,19 +29,3 @@ void *memmove(void *dst, const void *src, size_t len) ...@@ -79,19 +29,3 @@ void *memmove(void *dst, const void *src, size_t len)
} }
return dst; return dst;
} }
/*
* Scan @len bytes of @src for value @c
*/
void *memchr(const void *src, int c, size_t len)
{
const char *s = src;
while (len--) {
if (*s == c)
return (void *) s;
s++;
}
return NULL;
}
/*
* Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <stddef.h>
void *memset(void *dst, int val, size_t count)
{
char *ptr = dst;
while (count--)
*ptr++ = val;
return dst;
}
/* /*
* Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -7,11 +7,6 @@ ...@@ -7,11 +7,6 @@
#include <stdio.h> #include <stdio.h>
#include <console.h> #include <console.h>
/* Putchar() should either return the character printed or EOF in case of error.
* Our current console_putc() function assumes success and returns the
* character. Write all other printing functions in terms of putchar(), if
* possible, so they all benefit when this is improved.
*/
int putchar(int c) int putchar(int c)
{ {
int res; int res;
......
/* /*
* Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -9,15 +9,13 @@ ...@@ -9,15 +9,13 @@
int puts(const char *s) int puts(const char *s)
{ {
int count = 0; int count = 0;
while(*s) {
while (*s) {
if (putchar(*s++) == EOF) if (putchar(*s++) == EOF)
return EOF; return EOF;
count++; count++;
} }
/* According to the puts(3) manpage, the function should write a
* trailing newline.
*/
if (putchar('\n') == EOF) if (putchar('\n') == EOF)
return EOF; return EOF;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment