Re-indent using clang-format

diff --git a/compat.c b/compat.c
index b23af01cebd7fb66c39d70e4fb2ba9030c86570a..464bf52c8e6b47461dc16527334f2cb60f8e41fa 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -3,20 +3,20 @@
 char *
 strnstr(const char *s, const char *find, size_t slen)
 {
-    char c, sc;
-    size_t len;
+       char c, sc;
+       size_t len;
 
-    if ((c = *find++) != '\0') {
-        len = strlen(find);
-        do {
-            do {
-                if (slen-- < 1 || (sc = *s++) == '\0')
-                    return (NULL);
-            } while (sc != c);
-            if (len > slen)
-                return (NULL);
-        } while (strncmp(s, find, len) != 0);
-        s--;
-    }
-    return ((char *)s);
+       if ((c = *find++) != '\0') {
+               len = strlen(find);
+               do {
+                       do {
+                               if (slen-- < 1 || (sc = *s++) == '\0')
+                                       return (NULL);
+                       } while (sc != c);
+                       if (len > slen)
+                               return (NULL);
+               } while (strncmp(s, find, len) != 0);
+               s--;
+       }
+       return ((char *)s);
 }

diff --git a/elf.c b/elf.c
index ce9eafead50c278ce08823f0a67c10f8e979e517..0fc3810efe0fbebb48592768f765b0ceeef9eeaf 100644 (file)
--- a/elf.c
+++ b/elf.c
@@ -8,128 +8,128 @@
 
 #include "elf.h"
 
-
 Elf_Obj *
 elf_init(const char *filename)
 {
-    int fd;
-    struct stat sb;
-    Elf_Obj *e = NULL;
+       int fd;
+       struct stat sb;
+       Elf_Obj *e = NULL;
 
-    if ((fd = open(filename, O_RDONLY)) == -1)
-        errx(1, "open");
+       if ((fd = open(filename, O_RDONLY)) == -1)
+               errx(1, "open");
 
-    e = (Elf_Obj *)malloc(sizeof(Elf_Obj));
-    if (e == NULL)
-        errx(1, "malloc");
+       e = (Elf_Obj *)malloc(sizeof(Elf_Obj));
+       if (e == NULL)
+               errx(1, "malloc");
 
-    e->fd = fd;
+       e->fd = fd;
 
-    if (fstat(fd, &sb) == -1)
-        errx(1, "fstat");
+       if (fstat(fd, &sb) == -1)
+               errx(1, "fstat");
 
-    e->sb = sb;
+       e->sb = sb;
 
-    e->mm = mmap(NULL, sb.st_size, PROT_READ,  MAP_SHARED, fd, 0);
-    if (e->mm == MAP_FAILED)
-        errx(1, "mmap");
+       e->mm = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
+       if (e->mm == MAP_FAILED)
+               errx(1, "mmap");
 
-    e->ehdr = (Elf_Ehdr *) e->mm;
-    e->ehdr_size = e->ehdr->e_ehsize;
+       e->ehdr = (Elf_Ehdr *)e->mm;
+       e->ehdr_size = e->ehdr->e_ehsize;
 
-    if (e->sb.st_size < sizeof(Elf_Ehdr))
-        errx(1, "not a ELF object");
+       if (e->sb.st_size < sizeof(Elf_Ehdr))
+               errx(1, "not a ELF object");
 
-    if (memcmp(e->ehdr->e_ident, ELFMAG, sizeof(ELFMAG) -1) != 0)
-        errx(1, "not a ELF object");
+       if (memcmp(e->ehdr->e_ident, ELFMAG, sizeof(ELFMAG) - 1) != 0)
+               errx(1, "not a ELF object");
 
-    e->shdr = (Elf_Shdr *) (e->mm + e->ehdr->e_shoff);
-    e->shdr_size = e->ehdr->e_shnum;
+       e->shdr = (Elf_Shdr *)(e->mm + e->ehdr->e_shoff);
+       e->shdr_size = e->ehdr->e_shnum;
 
-    e->strtab = NULL;
-    e->strtab_size = 0;
+       e->strtab = NULL;
+       e->strtab_size = 0;
 
-    return (e);
+       return (e);
 }
 
 Elf_Shdr *
 elf_strtab(Elf_Obj *e)
 {
-    Elf_Shdr *ptr;
+       Elf_Shdr *ptr;
 
-    ptr = &e->shdr[e->ehdr->e_shstrndx];
-    e->strtab = malloc(ptr->sh_size);
-    if (e->strtab == NULL)
-        errx(1, "malloc %s:%d", __func__, __LINE__);
+       ptr = &e->shdr[e->ehdr->e_shstrndx];
+       e->strtab = malloc(ptr->sh_size);
+       if (e->strtab == NULL)
+               errx(1, "malloc %s:%d", __func__, __LINE__);
 
-    e->strtab_size = ptr->sh_size;
+       e->strtab_size = ptr->sh_size;
 
-    memcpy(e->strtab, (e->mm + ptr->sh_offset), ptr->sh_size);
+       memcpy(e->strtab, (e->mm + ptr->sh_offset), ptr->sh_size);
 
-    return (ptr);
+       return (ptr);
 }
 
 int
 elf_destroy(Elf_Obj *e)
 {
-    if (e == NULL)
-        return (1);
+       if (e == NULL)
+               return (1);
 
-    if (e->mm != NULL)
-        if (munmap(e->mm, e->sb.st_size) == -1)
-            return (1);
+       if (e->mm != NULL)
+               if (munmap(e->mm, e->sb.st_size) == -1)
+                       return (1);
 
-    close(e->fd);
+       close(e->fd);
 
-    if (e->strtab != NULL)
-        free(e->strtab);
+       if (e->strtab != NULL)
+               free(e->strtab);
 
-    free(e);
+       free(e);
 
-    return (0);
+       return (0);
 }
 
 char *
-elf_str_get(Elf_Obj *e, int index) {
-    if (e == NULL || index > e->strtab_size)
-        return (NULL);
+elf_str_get(Elf_Obj *e, int index)
+{
+       if (e == NULL || index > e->strtab_size)
+               return (NULL);
 
-    return (&e->strtab[e->shdr[index].sh_name]);
+       return (&e->strtab[e->shdr[index].sh_name]);
 }
 
 int
-elf_debug(Elf_Obj *e) 
+elf_debug(Elf_Obj *e)
 {
-    int i, has_debug = 0;
-    char *debug_prefix = ".debug_";
-    char *section_name = NULL;
-
-    for (i=0; i < e->shdr_size; i++) {
-        section_name = elf_str_get(e, i);
-        if (strnstr(section_name, debug_prefix, strlen(debug_prefix))) {
-            has_debug++;
-        }
-    }
-
-    return (has_debug);
+       int i, has_debug = 0;
+       char *debug_prefix = ".debug_";
+       char *section_name = NULL;
+
+       for (i = 0; i < e->shdr_size; i++) {
+               section_name = elf_str_get(e, i);
+               if (strnstr(section_name, debug_prefix, strlen(debug_prefix))) {
+                       has_debug++;
+               }
+       }
+
+       return (has_debug);
 }
 
 void
 elf_debug_print(Elf_Obj *e)
 {
-    int i;
-    char *debug_prefix = ".debug_";
-    char *section_name = NULL;
+       int i;
+       char *debug_prefix = ".debug_";
+       char *section_name = NULL;
 
-    printf("%d ELF debug sections:\n", elf_debug(e));
+       printf("%d ELF debug sections:\n", elf_debug(e));
 
-    for (i=0; i < e->shdr_size; i++) {
-        if (e->shdr[i].sh_type != SHT_PROGBITS)
-            continue;
+       for (i = 0; i < e->shdr_size; i++) {
+               if (e->shdr[i].sh_type != SHT_PROGBITS)
+                       continue;
 
-        section_name = elf_str_get(e, i);
-        if (strnstr(section_name, debug_prefix, strlen(debug_prefix))) {
-            printf("%s\n", section_name);
-        }
-    }
+               section_name = elf_str_get(e, i);
+               if (strnstr(section_name, debug_prefix, strlen(debug_prefix))) {
+                       printf("%s\n", section_name);
+               }
+       }
 }

diff --git a/elf.h b/elf.h
index 67a5c8436231e723caddad794994c11b4fc4cd1d..87e6a8e07fc91e3f8a8f77732b90dc8d3dd5bdf0 100644 (file)
--- a/elf.h
+++ b/elf.h
@@ -7,15 +7,15 @@
 #include "compat.h"
 
 typedef struct Elf_Obj {
-    int         fd; /* file descriptor */
-    struct stat sb; /* file stat */
-    char        *mm; /* memory mapping */
-    char        *strtab; /* string table */
-    size_t      strtab_size; /* string table size */
-    Elf_Ehdr    *ehdr; /* header pointer */
-    size_t      ehdr_size; /* header size */
-    Elf_Shdr    *shdr; /* section header pointer */
-    size_t      shdr_size; /* section header size */
+       int fd; /* file descriptor */
+       struct stat sb; /* file stat */
+       char *mm; /* memory mapping */
+       char *strtab; /* string table */
+       size_t strtab_size; /* string table size */
+       Elf_Ehdr *ehdr; /* header pointer */
+       size_t ehdr_size; /* header size */
+       Elf_Shdr *shdr; /* section header pointer */
+       size_t shdr_size; /* section header size */
 } Elf_Obj;
 
 Elf_Obj *elf_init(const char *);

diff --git a/elfdbg.c b/elfdbg.c
index 4cca84e48d04e76e200929ab263ef095408dc75f..6a762e19f9b08acea30d7ef94e5796312854388e 100644 (file)
--- a/elfdbg.c
+++ b/elfdbg.c
@@ -46,7 +46,7 @@ int
 main(int argc, char *argv[])
 {
        int rc, has_debug;
-       int ch, qflag=0, vflag=0;
+       int ch, qflag = 0, vflag = 0;
        Elf_Obj *e = NULL;
        Elf_Shdr *shstr = NULL;
 
@@ -55,15 +55,15 @@ main(int argc, char *argv[])
 
        while ((ch = getopt(argc, argv, "qhv")) != -1) {
                switch (ch) {
-                       case 'q':
-                               qflag = 1;
-                               break;
-                       case 'v':
-                               vflag = 1;
-                               break;
-                       case 'h':
-                               default:
-                               usage();
+               case 'q':
+                       qflag = 1;
+                       break;
+               case 'v':
+                       vflag = 1;
+                       break;
+               case 'h':
+               default:
+                       usage();
                }
        }