Added indenting tool for C code and reindented *.[ch] files

1 files changed, 110 insertions, 124 deletions

diff --git a/src/util.c b/src/util.c
index 15d24a7..d9ac510 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,3 +1,4 @@
+
 /*
  * Common "util" functions
  * This file is part of the dmidecode project.
@@ -48,46 +49,41 @@
 #include "util.h"
 
 #ifndef USE_MMAP
-static int myread(int fd, u8 *buf, size_t count, const char *prefix)
+static int myread(int fd, u8 * buf, size_t count, const char *prefix)
 {
-	ssize_t r = 1;
-	size_t r2 = 0;
-
-	while (r2 != count && r != 0)
-	{
-		r = read(fd, buf + r2, count - r2);
-		if (r == -1)
-		{
-			if (errno != EINTR)
-			{
-				close(fd);
-				perror(prefix);
-				return -1;
-			}
-		}
-		else
-			r2 += r;
-	}
-
-	if (r2 != count)
-	{
-		close(fd);
-		fprintf(stderr, "%s: Unexpected end of file\n", prefix);
-		return -1;
-	}
-
-	return 0;
+        ssize_t r = 1;
+        size_t r2 = 0;
+
+        while(r2 != count && r != 0) {
+                r = read(fd, buf + r2, count - r2);
+                if(r == -1) {
+                        if(errno != EINTR) {
+                                close(fd);
+                                perror(prefix);
+                                return -1;
+                        }
+                } else
+                        r2 += r;
+        }
+
+        if(r2 != count) {
+                close(fd);
+                fprintf(stderr, "%s: Unexpected end of file\n", prefix);
+                return -1;
+        }
+
+        return 0;
 }
 #endif
 
-int checksum(const u8 *buf, size_t len)
+int checksum(const u8 * buf, size_t len)
 {
-	u8 sum = 0;
-	size_t a;
+        u8 sum = 0;
+        size_t a;
 
-	for (a = 0; a < len; a++)
-		sum += buf[a];
-	return (sum == 0);
+        for(a = 0; a < len; a++)
+                sum += buf[a];
+        return (sum == 0);
 }
 
 /*
@@ -96,110 +92,100 @@ int checksum(const u8 *buf, size_t len)
  */
 void *mem_chunk(size_t base, size_t len, const char *devmem)
 {
-	void *p;
-	int fd;
+        void *p;
+        int fd;
+
 #ifdef USE_MMAP
-	size_t mmoffset;
-	void *mmp;
+        size_t mmoffset;
+        void *mmp;
 #endif
 
-	if ((fd = open(devmem, O_RDONLY)) == -1)
-	{
-		perror(devmem);
-		return NULL;
-	}
-
-	if ((p = malloc(len)) == NULL)
-	{
-		perror("malloc");
-		return NULL;
-	}
+        if((fd = open(devmem, O_RDONLY)) == -1) {
+                perror(devmem);
+                return NULL;
+        }
 
+        if((p = malloc(len)) == NULL) {
+                perror("malloc");
+                return NULL;
+        }
 #ifdef USE_MMAP
 #ifdef _SC_PAGESIZE
-	mmoffset = base % sysconf(_SC_PAGESIZE);
+        mmoffset = base % sysconf(_SC_PAGESIZE);
 #else
-	mmoffset = base % getpagesize();
+        mmoffset = base % getpagesize();
 #endif /* _SC_PAGESIZE */
-	/*
-	 * Please note that we don't use mmap() for performance reasons here,
-	 * but to workaround problems many people encountered when trying
-	 * to read from /dev/mem using regular read() calls.
-	 */
-	mmp = mmap(0, mmoffset + len, PROT_READ, MAP_SHARED, fd, base - mmoffset);
-	if (mmp == MAP_FAILED)
-	{
-		fprintf(stderr, "%s: ", devmem);
-		perror("mmap");
-		free(p);
-		return NULL;
-	}
-
-	memcpy(p, (u8 *)mmp + mmoffset, len);
-
-	if (munmap(mmp, mmoffset + len) == -1)
-	{
-		fprintf(stderr, "%s: ", devmem);
-		perror("munmap");
-	}
+        /*
+         * Please note that we don't use mmap() for performance reasons here,
+         * but to workaround problems many people encountered when trying
+         * to read from /dev/mem using regular read() calls.
+         */
+        mmp = mmap(0, mmoffset + len, PROT_READ, MAP_SHARED, fd, base - mmoffset);
+        if(mmp == MAP_FAILED) {
+                fprintf(stderr, "%s: ", devmem);
+                perror("mmap");
+                free(p);
+                return NULL;
+        }
+
+        memcpy(p, (u8 *) mmp + mmoffset, len);
+
+        if(munmap(mmp, mmoffset + len) == -1) {
+                fprintf(stderr, "%s: ", devmem);
+                perror("munmap");
+        }
 #else /* USE_MMAP */
-	if (lseek(fd, base, SEEK_SET) == -1)
-	{
-		fprintf(stderr, "%s: ", devmem);
-		perror("lseek");
-		free(p);
-		return NULL;
-	}
-
-	if (myread(fd, p, len, devmem) == -1)
-	{
-		free(p);
-		return NULL;
-	}
+        if(lseek(fd, base, SEEK_SET) == -1) {
+                fprintf(stderr, "%s: ", devmem);
+                perror("lseek");
+                free(p);
+                return NULL;
+        }
+
+        if(myread(fd, p, len, devmem) == -1) {
+                free(p);
+                return NULL;
+        }
 #endif /* USE_MMAP */
 
-	if (close(fd) == -1)
-		perror(devmem);
+        if(close(fd) == -1)
+                perror(devmem);
 
-	return p;
+        return p;
 }
 
 int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add)
 {
-	FILE *f;
-
-	f = fopen(dumpfile, add ? "r+b" : "wb");
-	if (!f)
-	{
-		fprintf(stderr, "%s: ", dumpfile);
-		perror("fopen");
-		return -1;
-	}
-
-	if (fseek(f, base, SEEK_SET) != 0)
-	{
-		fprintf(stderr, "%s: ", dumpfile);
-		perror("fseek");
-		goto err_close;
-	}
-
-	if (fwrite(data, len, 1, f) != 1)
-	{
-		fprintf(stderr, "%s: ", dumpfile);
-		perror("fwrite");
-		goto err_close;
-	}
-
-	if (fclose(f))
-	{
-		fprintf(stderr, "%s: ", dumpfile);
-		perror("fclose");
-		return -1;
-	}
-
-	return 0;
-
-err_close:
-	fclose(f);
-	return -1;
+        FILE *f;
+
+        f = fopen(dumpfile, add ? "r+b" : "wb");
+        if(!f) {
+                fprintf(stderr, "%s: ", dumpfile);
+                perror("fopen");
+                return -1;
+        }
+
+        if(fseek(f, base, SEEK_SET) != 0) {
+                fprintf(stderr, "%s: ", dumpfile);
+                perror("fseek");
+                goto err_close;
+        }
+
+        if(fwrite(data, len, 1, f) != 1) {
+                fprintf(stderr, "%s: ", dumpfile);
+                perror("fwrite");
+                goto err_close;
+        }
+
+        if(fclose(f)) {
+                fprintf(stderr, "%s: ", dumpfile);
+                perror("fclose");
+                return -1;
+        }
+
+        return 0;
+
+      err_close:
+        fclose(f);
+        return -1;
 }