C90 compliance, except variadic macros and TODOs

[centaur.git] / src / modelops / section.c

diff --git a/src/modelops/section.c b/src/modelops/section.c
index a96377ca21f00d1b4d8b8d26c6be244c3a8da492..26751268a8c537128c9eb451c48f0669ef97979e 100644 (file)
--- a/src/modelops/section.c
+++ b/src/modelops/section.c
@@ -146,11 +146,14 @@ static void* subScnsToArray(ElfuElf *me, ElfuScn *ms, void *aux1, void *aux2)
 
 static int cmpScnOffs(const void *ms1, const void *ms2)
 {
+  ElfuScn *s1;
+  ElfuScn *s2;
+
   assert(ms1);
   assert(ms2);
 
-  ElfuScn *s1 = *(ElfuScn**)ms1;
-  ElfuScn *s2 = *(ElfuScn**)ms2;
+  s1 = *(ElfuScn**)ms1;
+  s2 = *(ElfuScn**)ms2;
 
   assert(s1);
   assert(s2);
@@ -167,12 +170,12 @@ static int cmpScnOffs(const void *ms1, const void *ms2)
 
 ElfuScn** elfu_mScnSortedByOffset(ElfuElf *me, size_t *count)
 {
-  assert(me);
-
   size_t numSecs;
   ElfuScn **sortedSecs;
   size_t i;
 
+  assert(me);
+
   /* Sort sections by offset in file */
   numSecs = elfu_mScnCount(me);
   sortedSecs = malloc(numSecs * sizeof(*sortedSecs));