uml: formatting fixes
Formatting fixes - style violations whitespace breakage emacs formatting comment removal Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
11100b1dfb
commit
a5ed1ffa6c
@@ -21,7 +21,7 @@ void arch_check_bugs(void)
|
||||
|
||||
int arch_handle_signal(int sig, union uml_pt_regs *regs)
|
||||
{
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define MAXTOKEN 64
|
||||
@@ -41,21 +41,21 @@ static char token(int fd, char *buf, int len, char stop)
|
||||
n = os_read_file(fd, ptr, sizeof(*ptr));
|
||||
c = *ptr++;
|
||||
if(n != sizeof(*ptr)){
|
||||
if(n == 0) return(0);
|
||||
if(n == 0)
|
||||
return 0;
|
||||
printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
|
||||
if(n < 0)
|
||||
return(n);
|
||||
else
|
||||
return(-EIO);
|
||||
return n;
|
||||
else return -EIO;
|
||||
}
|
||||
} while((c != '\n') && (c != stop) && (ptr < end));
|
||||
|
||||
if(ptr == end){
|
||||
printk("Failed to find '%c' in /proc/cpuinfo\n", stop);
|
||||
return(-1);
|
||||
return -1;
|
||||
}
|
||||
*(ptr - 1) = '\0';
|
||||
return(c);
|
||||
return c;
|
||||
}
|
||||
|
||||
static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
|
||||
@@ -67,33 +67,23 @@ static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
|
||||
while(1){
|
||||
c = token(fd, scratch, len - 1, ':');
|
||||
if(c <= 0)
|
||||
return(0);
|
||||
return 0;
|
||||
else if(c != ':'){
|
||||
printk("Failed to find ':' in /proc/cpuinfo\n");
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(!strncmp(scratch, key, strlen(key)))
|
||||
return(1);
|
||||
return 1;
|
||||
|
||||
do {
|
||||
n = os_read_file(fd, &c, sizeof(c));
|
||||
if(n != sizeof(c)){
|
||||
printk("Failed to find newline in "
|
||||
"/proc/cpuinfo, err = %d\n", -n);
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
} while(c != '\n');
|
||||
}
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* Emacs will notice this stuff at the end of the file and automatically
|
||||
* adjust the settings for this buffer only. This must remain at the end
|
||||
* of the file.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-file-style: "linux"
|
||||
* End:
|
||||
*/
|
||||
|
Reference in New Issue
Block a user