[GitHub] rymanluk closed pull request #82: mesh: shell: Rename init function to avoid redefinition

[GitBox <gi...@apache.org>]

rymanluk closed pull request #82: mesh: shell: Rename init function to avoid redefinition
URL: https://github.com/apache/mynewt-nimble/pull/82
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/nimble/host/mesh/include/mesh/testing.h b/nimble/host/mesh/include/mesh/testing.h
index 673c2cef..1243384c 100644
--- a/nimble/host/mesh/include/mesh/testing.h
+++ b/nimble/host/mesh/include/mesh/testing.h
@@ -59,7 +59,7 @@ void bt_test_cb_unregister(struct bt_test_cb *cb);
 
 u8_t mod_bind(struct bt_mesh_model *model, u16_t key_idx);
 u8_t mod_unbind(struct bt_mesh_model *model, u16_t key_idx);
-int cmd_init(int argc, char *argv[]);
+int cmd_mesh_init(int argc, char *argv[]);
 
 int bt_test_shell_init(void);
 int bt_test_bind_app_key_to_model(struct bt_mesh_model *model, u16_t key_idx, u16_t id);
diff --git a/nimble/host/mesh/src/shell.c b/nimble/host/mesh/src/shell.c
index 379115fc..bce94a8e 100644
--- a/nimble/host/mesh/src/shell.c
+++ b/nimble/host/mesh/src/shell.c
@@ -633,7 +633,7 @@ static int check_pub_addr_unassigned(void)
 #endif
 }
 
-int cmd_init(int argc, char *argv[])
+int cmd_mesh_init(int argc, char *argv[])
 {
 	int err;
 	ble_addr_t addr;
@@ -2374,7 +2374,7 @@ static int cmd_print_composition_data(int argc, char *argv[])
 }
 
 static const struct shell_cmd mesh_commands[] = {
-	{ "init", cmd_init, NULL },
+	{ "init", cmd_mesh_init, NULL },
 #if MYNEWT_VAL(BLE_MESH_PB_ADV)
 	{ "pb-adv", cmd_pb_adv, &cmd_pb_help },
 #endif
diff --git a/nimble/host/mesh/src/testing.c b/nimble/host/mesh/src/testing.c
index 8db62f7a..e9fcc7be 100644
--- a/nimble/host/mesh/src/testing.c
+++ b/nimble/host/mesh/src/testing.c
@@ -157,7 +157,7 @@ void bt_test_print_credentials(void)
 
 int bt_test_shell_init(void)
 {
-	return cmd_init(0, NULL);
+	return cmd_mesh_init(0, NULL);
 }
 
 int bt_test_bind_app_key_to_model(struct bt_mesh_model *model, u16_t key_idx, u16_t id)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services