Changeset f93f168 in mainline

Timestamp:

2008-07-08T17:27:42Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4e4052b

Parents:

c98e6ee

Message:

Some Cstyle

File:

• uspace/srv/loader/elf_load.c (modified) (5 diffs)

uspace/srv/loader/elf_load.c

@@ -225 +225 @@
 
                 rc = read(elf->fd, &segment_hdr, sizeof(elf_segment_header_t));
-                if (rc < 0) { printf("read error\n"); return EE_INVALID; }
+                if (rc < 0) {
+                        printf("read error\n");
+                        return EE_INVALID;
+                }
 
                 rc = segment_header(elf, &segment_hdr);
@@ -243 +246 @@
 
                 rc = read(elf->fd, &section_hdr, sizeof(elf_section_header_t));
-                if (rc < 0) { printf("read error\n"); return EE_INVALID; }
+                if (rc < 0) {
+                        printf("read error\n");
+                        return EE_INVALID;
+                }
 
                 rc = section_header(elf, &section_hdr);
@@ -327 +333 @@
                 if ((entry->p_offset % entry->p_align) !=
                     (entry->p_vaddr % entry->p_align)) {
-                        printf("align check 1 failed offset%%align=%d, vaddr%%align=%d\n",
-                        entry->p_offset % entry->p_align,
-                        entry->p_vaddr % entry->p_align
+                        printf("align check 1 failed offset%%align=%d, "
+                            "vaddr%%align=%d\n",
+                            entry->p_offset % entry->p_align,
+                            entry->p_vaddr % entry->p_align
                         );
                         return EE_INVALID;
@@ -370 +377 @@
 //      printf("seek to %d\n", entry->p_offset);
         rc = lseek(elf->fd, entry->p_offset, SEEK_SET);
-        if (rc < 0) { printf("seek error\n"); return EE_INVALID; }
+        if (rc < 0) {
+                printf("seek error\n");
+                return EE_INVALID;
+        }
 
 //      printf("read 0x%x bytes to address 0x%x\n", entry->p_filesz, entry->p_vaddr+bias);
@@ -392 +402 @@
 //              printf("->%d\n", rc);
 
-                if (rc < 0) { printf("read error\n"); return EE_INVALID; }
+                if (rc < 0) { 
+                        printf("read error\n");
+                        return EE_INVALID;
+                }
 
                 left -= now;