uml: style fixes in arch/um/os-Linux

Style changes under arch/um/os-Linux:
	include trimming
	CodingStyle fixes
	some printks needed severity indicators

make_tempfile turns out not to be used outside of mem.c, so it is now static.
Its declaration in tempfile.h is no longer needed, and tempfile.h itself is no
longer needed.

create_tmp_file was also made static.

checkpatch moans about an EXPORT_SYMBOL in user_syms.c which is part of a
macro definition - this is copying a bit of kernel infrastructure into the
libc side of UML because the kernel headers can't be included there.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 50 insertions, 51 deletions

diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index eedc2d88ef8a..38742c21def5 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -1,22 +1,21 @@
+/*
+ * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL
+ */
+
 #include <stdio.h>
-#include <stdlib.h>
 #include <stddef.h>
-#include <stdarg.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <string.h>
 #include <fcntl.h>
-#include <sys/types.h>
+#include <string.h>
 #include <sys/mman.h>
-#include <sys/statfs.h>
-#include "user.h"
-#include "mem_user.h"
+#include <sys/param.h>
 #include "init.h"
-#include "os.h"
-#include "tempfile.h"
 #include "kern_constants.h"
-
-#include <sys/param.h>
+#include "os.h"
+#include "user.h"
 
 /* Modified by which_tmpdir, which is called during early boot */
 static char *default_tmpdir = "/tmp";
@@ -33,18 +32,19 @@ static void __init find_tempdir(void)
         int i;
         char *dir = NULL;
 
-        if(tempdir != NULL) /* We've already been called */
+        if (tempdir != NULL)
+                /* We've already been called */
                 return;
-        for(i = 0; dirs[i]; i++){
+        for (i = 0; dirs[i]; i++) {
                 dir = getenv(dirs[i]);
-                if((dir != NULL) && (*dir != '\0'))
+                if ((dir != NULL) && (*dir != '\0'))
                         break;
         }
-        if((dir == NULL) || (*dir == '\0'))
+        if ((dir == NULL) || (*dir == '\0'))
                 dir = default_tmpdir;
 
         tempdir = malloc(strlen(dir) + 2);
-        if(tempdir == NULL){
+        if (tempdir == NULL) {
                 fprintf(stderr, "Failed to malloc tempdir, "
                         "errno = %d\n", errno);
                 return;
@@ -53,7 +53,8 @@ static void __init find_tempdir(void)
         strcat(tempdir, "/");
 }
 
-/* This will return 1, with the first character in buf being the
+/*
+ * This will return 1, with the first character in buf being the
  * character following the next instance of c in the file.  This will
  * read the file as needed.  If there's an error, -errno is returned;
  * if the end of the file is reached, 0 is returned.
@@ -64,11 +65,11 @@ static int next(int fd, char *buf, size_t size, char c)
         size_t len;
         char *ptr;
 
-        while((ptr = strchr(buf, c)) == NULL){
+        while ((ptr = strchr(buf, c)) == NULL) {
                 n = read(fd, buf, size - 1);
-                if(n == 0)
+                if (n == 0)
                         return 0;
-                else if(n < 0)
+                else if (n < 0)
                         return -errno;
 
                 buf[n] = '\0';
@@ -78,11 +79,12 @@ static int next(int fd, char *buf, size_t size, char c)
         len = strlen(ptr);
         memmove(buf, ptr, len + 1);
 
-        /* Refill the buffer so that if there's a partial string that we care
+        /*
+         * Refill the buffer so that if there's a partial string that we care
          * about, it will be completed, and we can recognize it.
          */
         n = read(fd, &buf[len], size - len - 1);
-        if(n < 0)
+        if (n < 0)
                 return -errno;
 
         buf[len + n] = '\0';
@@ -92,7 +94,8 @@ static int next(int fd, char *buf, size_t size, char c)
 /* which_tmpdir is called only during early boot */
 static int checked_tmpdir = 0;
 
-/* Look for a tmpfs mounted at /dev/shm.  I couldn't find a cleaner
+/*
+ * Look for a tmpfs mounted at /dev/shm.  I couldn't find a cleaner
  * way to do this than to parse /proc/mounts.  statfs will return the
  * same filesystem magic number and fs id for both /dev and /dev/shm
  * when they are both tmpfs, so you can't tell if they are different
@@ -107,7 +110,7 @@ static void which_tmpdir(void)
         int fd, found;
         char buf[128] = { '\0' };
 
-        if(checked_tmpdir)
+        if (checked_tmpdir)
                 return;
 
         checked_tmpdir = 1;
@@ -115,28 +118,28 @@ static void which_tmpdir(void)
         printf("Checking for tmpfs mount on /dev/shm...");
 
         fd = open("/proc/mounts", O_RDONLY);
-        if(fd < 0){
+        if (fd < 0) {
                 printf("failed to open /proc/mounts, errno = %d\n", errno);
                 return;
         }
 
-        while(1){
+        while (1) {
                 found = next(fd, buf, ARRAY_SIZE(buf), ' ');
-                if(found != 1)
+                if (found != 1)
                         break;
 
-                if(!strncmp(buf, "/dev/shm", strlen("/dev/shm")))
+                if (!strncmp(buf, "/dev/shm", strlen("/dev/shm")))
                         goto found;
 
                 found = next(fd, buf, ARRAY_SIZE(buf), '\n');
-                if(found != 1)
+                if (found != 1)
                         break;
         }
 
 err:
-        if(found == 0)
+        if (found == 0)
                 printf("nothing mounted on /dev/shm\n");
-        else if(found < 0)
+        else if (found < 0)
                 printf("read returned errno %d\n", -found);
 
 out:
@@ -146,10 +149,10 @@ out:
 
 found:
         found = next(fd, buf, ARRAY_SIZE(buf), ' ');
-        if(found != 1)
+        if (found != 1)
                 goto err;
 
-        if(strncmp(buf, "tmpfs", strlen("tmpfs"))){
+        if (strncmp(buf, "tmpfs", strlen("tmpfs"))) {
                 printf("not tmpfs\n");
                 goto out;
         }
@@ -164,8 +167,8 @@ found:
  * (file: kernel/tt/ptproxy/proxy.c, proc: start_debugger).
  * So it isn't 'static' yet.
  */
-int __init make_tempfile(const char *template, char **out_tempname,
-                         int do_unlink)
+static int __init make_tempfile(const char *template, char **out_tempname,
+                                int do_unlink)
 {
         char *tempname;
         int fd;
@@ -182,16 +185,16 @@ int __init make_tempfile(const char *template, char **out_tempname,
                 tempname[0] = '\0';
         strncat(tempname, template, MAXPATHLEN-1-strlen(tempname));
         fd = mkstemp(tempname);
-        if(fd < 0){
+        if (fd < 0) {
                 fprintf(stderr, "open - cannot create %s: %s\n", tempname,
                         strerror(errno));
                 goto out;
         }
-        if(do_unlink && (unlink(tempname) < 0)){
+        if (do_unlink && (unlink(tempname) < 0)) {
                 perror("unlink");
                 goto out;
         }
-        if(out_tempname){
+        if (out_tempname) {
                 *out_tempname = tempname;
         } else {
                 free(tempname);
@@ -204,27 +207,23 @@ out:
 
 #define TEMPNAME_TEMPLATE "vm_file-XXXXXX"
 
-/*
- * This proc is used in start_up.c
- * So it isn't 'static'.
- */
-int __init create_tmp_file(unsigned long long len)
+static int __init create_tmp_file(unsigned long long len)
 {
         int fd, err;
         char zero;
 
         fd = make_tempfile(TEMPNAME_TEMPLATE, NULL, 1);
-        if(fd < 0) {
+        if (fd < 0)
                 exit(1);
-        }
 
         err = fchmod(fd, 0777);
-        if(err < 0){
+        if (err < 0) {
                 perror("fchmod");
                 exit(1);
         }
 
-        /* Seek to len - 1 because writing a character there will
+        /*
+         * Seek to len - 1 because writing a character there will
          * increase the file size by one byte, to the desired length.
          */
         if (lseek64(fd, len - 1, SEEK_SET) < 0) {
@@ -235,7 +234,7 @@ int __init create_tmp_file(unsigned long long len)
         zero = 0;
 
         err = write(fd, &zero, 1);
-        if(err != 1){
+        if (err != 1) {
                 perror("write");
                 exit(1);
         }
@@ -250,7 +249,7 @@ int __init create_mem_file(unsigned long long len)
         fd = create_tmp_file(len);
 
         err = os_set_exec_close(fd);
-        if(err < 0){
+        if (err < 0) {
                 errno = -err;
                 perror("exec_close");
         }
@@ -267,11 +266,11 @@ void __init check_tmpexec(void)
                     PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, fd, 0);
         printf("Checking PROT_EXEC mmap in %s...",tempdir);
         fflush(stdout);
-        if(addr == MAP_FAILED){
+        if (addr == MAP_FAILED) {
                 err = errno;
                 perror("failed");
                 close(fd);
-                if(err == EPERM)
+                if (err == EPERM)
                         printf("%s must be not mounted noexec\n",tempdir);
                 exit(1);
         }