aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/mem.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/os-Linux/mem.c')
-rw-r--r--arch/um/os-Linux/mem.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index c3b736adc1d9..9674ed1bef2f 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -30,7 +30,7 @@ static char *tempdir = NULL;
30 30
31static void __init find_tempdir(void) 31static void __init find_tempdir(void)
32{ 32{
33 char *dirs[] = { "TMP", "TEMP", "TMPDIR", NULL }; 33 const char *dirs[] = { "TMP", "TEMP", "TMPDIR", NULL };
34 int i; 34 int i;
35 char *dir = NULL; 35 char *dir = NULL;
36 36
@@ -59,9 +59,10 @@ static void __init find_tempdir(void)
59 * read the file as needed. If there's an error, -errno is returned; 59 * read the file as needed. If there's an error, -errno is returned;
60 * if the end of the file is reached, 0 is returned. 60 * if the end of the file is reached, 0 is returned.
61 */ 61 */
62static int next(int fd, char *buf, int size, char c) 62static int next(int fd, char *buf, size_t size, char c)
63{ 63{
64 int n, len; 64 ssize_t n;
65 size_t len;
65 char *ptr; 66 char *ptr;
66 67
67 while((ptr = strchr(buf, c)) == NULL){ 68 while((ptr = strchr(buf, c)) == NULL){