Rename INIT_LAST to INIT_FUNC to avoid confusion

We don't have an INIT_FIRST, so let's rename INIT_LAST to INIT_FUNC
to imply that the function is called at program start-up.

Also: the priority argument for __attribute__((constructor)) isn't
used, so let's remove it.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/include/libbb.h b/include/libbb.h
index cede50cc28967de83e4353ab57a7fb5cf3bb403d..858084bc5b7dcb83823694f788cdb825dade1bf5 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1960,7 +1960,7 @@ void bbunit_settestfailed(void);
                .name = #NAME, \
                .testfunc = bbunit_##NAME##_test, \
        }; \
-       static void INIT_LAST bbunit_##NAME##_register(void) \
+       static void INIT_FUNC bbunit_##NAME##_register(void) \
        { \
                bbunit_registertest(&bbunit_##NAME##_elem); \
        } \

diff --git a/include/platform.h b/include/platform.h
index 413c2224c1f1a15ac16366101b0232e722e39bef..09c7ccd9ca29fa64a8d250a1fd69143abe361d80 100644 (file)
--- a/include/platform.h
+++ b/include/platform.h
@@ -76,8 +76,8 @@
 # define UNUSED_PARAM_RESULT
 #endif
 
-/* used by unit test machinery to run registration functions */
-#define INIT_LAST __attribute__ ((constructor(2000)))
+/* used by unit test machinery to run registration functions before calling main() */
+#define INIT_FUNC __attribute__ ((constructor))
 
 /* -fwhole-program makes all symbols local. The attribute externally_visible
  * forces a symbol global.  */