baselibc: Call mynewt_main() instead of main()

commit: 0adba9d68dcf950d44815d89ceafca8a4f048f41 [log] [tgz]
author: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl> Wed Dec 01 14:31:25 2021 +0100
committer: kasjer <kasjer@users.noreply.github.com> Mon Sep 25 11:47:39 2023 +0200
tree: eb8ff278dbfd53e6f75a80eb4df86d38163e57a5
parent: d6956244245776abed59bfdc87763638a60b001b [diff]
diff --git a/apps/bleprph_oic/src/main.c b/apps/bleprph_oic/src/main.c
index 05040b5..23a180b 100644
--- a/apps/bleprph_oic/src/main.c
+++ b/apps/bleprph_oic/src/main.c

@@ -362,7 +362,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/blesplit/src/main.c b/apps/blesplit/src/main.c
index a440f7f..8fef1ef 100644
--- a/apps/blesplit/src/main.c
+++ b/apps/blesplit/src/main.c

@@ -284,7 +284,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/bleuart/src/main.c b/apps/bleuart/src/main.c
index 098f29b..d23a4dc 100644
--- a/apps/bleuart/src/main.c
+++ b/apps/bleuart/src/main.c

@@ -195,7 +195,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/bsncent/src/main.c b/apps/bsncent/src/main.c
index 00b9aea..f616ba1 100644
--- a/apps/bsncent/src/main.c
+++ b/apps/bsncent/src/main.c

@@ -411,7 +411,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/bsnprph/src/main.c b/apps/bsnprph/src/main.c
index bc6fec2..4b86ee7 100644
--- a/apps/bsnprph/src/main.c
+++ b/apps/bsnprph/src/main.c

@@ -318,7 +318,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/bus_test/src/main.c b/apps/bus_test/src/main.c
index 4a43a7d..a4d54ae 100644
--- a/apps/bus_test/src/main.c
+++ b/apps/bus_test/src/main.c

@@ -148,7 +148,7 @@
 #endif
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/buzzer/src/main.c b/apps/buzzer/src/main.c
index a4a6a6c..da6b7bf 100755
--- a/apps/buzzer/src/main.c
+++ b/apps/buzzer/src/main.c

@@ -27,7 +27,7 @@
 int count = 0;
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     sysinit();
 

diff --git a/apps/crypto_test/src/main.c b/apps/crypto_test/src/main.c
index 08ecb21..cbe20ea 100755
--- a/apps/crypto_test/src/main.c
+++ b/apps/crypto_test/src/main.c

@@ -935,7 +935,7 @@
 #endif /* MYNEWT_VAL(CRYPTOTEST_IOVEC) */
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     struct crypto_dev *crypto;
 #if MYNEWT_VAL(CRYPTOTEST_BENCHMARK)

diff --git a/apps/ffs2native/src/main.c b/apps/ffs2native/src/main.c
index 2a7323c..1d88f4a 100644
--- a/apps/ffs2native/src/main.c
+++ b/apps/ffs2native/src/main.c

@@ -626,7 +626,7 @@
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     FILE *fp;
     int fd;

diff --git a/apps/fs_test/src/main.c b/apps/fs_test/src/main.c
index 7246a94..5d5a828 100644
--- a/apps/fs_test/src/main.c
+++ b/apps/fs_test/src/main.c

@@ -433,7 +433,7 @@
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
 #ifdef ARCH_sim
     mcu_sim_parse_args(argc, argv);

diff --git a/apps/hash_test/src/main.c b/apps/hash_test/src/main.c
index 8345d63..fd1a51f 100755
--- a/apps/hash_test/src/main.c
+++ b/apps/hash_test/src/main.c

@@ -580,7 +580,7 @@
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     struct hash_dev *hash;
     struct hash_sha256_context hash_sha256;

diff --git a/apps/iptest/src/main.c b/apps/iptest/src/main.c
index c0ca241..9d940b3 100644
--- a/apps/iptest/src/main.c
+++ b/apps/iptest/src/main.c

@@ -414,7 +414,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
 #ifdef ARCH_sim
     mcu_sim_parse_args(argc, argv);

diff --git a/apps/lora_app_shell/src/main.c b/apps/lora_app_shell/src/main.c
index 13bb578..8759fc8 100644
--- a/apps/lora_app_shell/src/main.c
+++ b/apps/lora_app_shell/src/main.c

@@ -135,7 +135,7 @@
 };
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
 #ifdef ARCH_sim
     mcu_sim_parse_args(argc, argv);

diff --git a/apps/loraping/src/main.c b/apps/loraping/src/main.c
index 85c507f..1cb91fb 100644
--- a/apps/loraping/src/main.c
+++ b/apps/loraping/src/main.c

@@ -213,7 +213,7 @@
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     RadioEvents_t radio_events;
 

diff --git a/apps/lorashell/src/main.c b/apps/lorashell/src/main.c
index 98aad07..283fc91 100644
--- a/apps/lorashell/src/main.c
+++ b/apps/lorashell/src/main.c

@@ -470,7 +470,7 @@
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     RadioEvents_t radio_events;
     int rc;

diff --git a/apps/metrics/src/main.c b/apps/metrics/src/main.c
index b5f9671..efaf144 100755
--- a/apps/metrics/src/main.c
+++ b/apps/metrics/src/main.c

@@ -97,7 +97,7 @@
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     struct os_mbuf *om;
     int i;

diff --git a/apps/ocf_sample/src/main.c b/apps/ocf_sample/src/main.c
index 3a3804e..e120de1 100644
--- a/apps/ocf_sample/src/main.c
+++ b/apps/ocf_sample/src/main.c

@@ -240,7 +240,7 @@
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
 #ifdef ARCH_sim
     mcu_sim_parse_args(argc, argv);

diff --git a/apps/osdp_sample/src/main.c b/apps/osdp_sample/src/main.c
index 54dc97c..490a93a 100644
--- a/apps/osdp_sample/src/main.c
+++ b/apps/osdp_sample/src/main.c

@@ -309,7 +309,7 @@
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     int rc, len;
     uint8_t key_buf[16];

diff --git a/apps/pwm_test/src/main.c b/apps/pwm_test/src/main.c
index 9af6c66..278c775 100644
--- a/apps/pwm_test/src/main.c
+++ b/apps/pwm_test/src/main.c

@@ -172,7 +172,7 @@
 }
 
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     sysinit();
 

diff --git a/apps/sensors_test/src/main.c b/apps/sensors_test/src/main.c
index 37399c0..89843de 100644
--- a/apps/sensors_test/src/main.c
+++ b/apps/sensors_test/src/main.c

@@ -449,7 +449,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
 
 #ifdef ARCH_sim

diff --git a/apps/slinky/src/main.c b/apps/slinky/src/main.c
index e352303..d95b166 100644
--- a/apps/slinky/src/main.c
+++ b/apps/slinky/src/main.c

@@ -215,7 +215,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/slinky_oic/src/main.c b/apps/slinky_oic/src/main.c
index 5d38f6b..4a41a26 100644
--- a/apps/slinky_oic/src/main.c
+++ b/apps/slinky_oic/src/main.c

@@ -252,7 +252,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/spitest/src/main.c b/apps/spitest/src/main.c
index 3374078..4b600dc 100644
--- a/apps/spitest/src/main.c
+++ b/apps/spitest/src/main.c

@@ -426,7 +426,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/splitty/src/main.c b/apps/splitty/src/main.c
index 8ef8820..d1a8975 100644
--- a/apps/splitty/src/main.c
+++ b/apps/splitty/src/main.c

@@ -174,7 +174,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/timtest/src/main.c b/apps/timtest/src/main.c
index 7b348e6..a8b60be 100644
--- a/apps/timtest/src/main.c
+++ b/apps/timtest/src/main.c

@@ -191,7 +191,7 @@
  * @return int NOTE: this function should never return!
  */
 int
-main(int argc, char **argv)
+mynewt_main(int argc, char **argv)
 {
     int rc;
 

diff --git a/apps/trng_test/src/main.c b/apps/trng_test/src/main.c
index 1d20a9e..bef4402 100755
--- a/apps/trng_test/src/main.c
+++ b/apps/trng_test/src/main.c

@@ -142,7 +142,7 @@
 }
 
 int
-main(void)
+mynewt_main(int argc, char **argv)
 {
     struct trng_dev *trng;
     size_t size;

diff --git a/libc/baselibc/src/start.c b/libc/baselibc/src/start.c
index 7b12472..fc63f74 100644
--- a/libc/baselibc/src/start.c
+++ b/libc/baselibc/src/start.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include "os/mynewt.h"
 
-extern int main(int argc, char **argv);
+extern int mynewt_main(int, char **);
 void __libc_init_array(void);
 
 /*
@@ -40,10 +40,10 @@
 #if !MYNEWT_VAL(OS_SCHEDULING)
     int rc;
 
-    rc = main(0, NULL);
+    rc = mynewt_main(0, NULL);
     exit(rc);
 #else
-    os_init(main);
+    os_init(mynewt_main);
     os_start();
 #endif
 }
commit	0adba9d68dcf950d44815d89ceafca8a4f048f41	[log] [tgz]
author	Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>	Wed Dec 01 14:31:25 2021 +0100
committer	kasjer <kasjer@users.noreply.github.com>	Mon Sep 25 11:47:39 2023 +0200
tree	eb8ff278dbfd53e6f75a80eb4df86d38163e57a5
parent	d6956244245776abed59bfdc87763638a60b001b [diff]