summaryrefslogtreecommitdiff
path: root/nuttx/binfmt/libbuiltin
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-17 14:43:55 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-17 14:43:55 +0000
commitd8d9cc8a96cdc2219af7bec8142e7633779fd685 (patch)
treed9cf39f88361f174a2350d354ffb5584d43e2fc4 /nuttx/binfmt/libbuiltin
parent4f0e8b1249c1550bac83f9db61c67094bc6afc2d (diff)
downloadpx4-nuttx-d8d9cc8a96cdc2219af7bec8142e7633779fd685.tar.gz
px4-nuttx-d8d9cc8a96cdc2219af7bec8142e7633779fd685.tar.bz2
px4-nuttx-d8d9cc8a96cdc2219af7bec8142e7633779fd685.zip
Add logic to automatically unload module on exit; Several patches from Mike Smith
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5528 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/binfmt/libbuiltin')
-rw-r--r--nuttx/binfmt/libbuiltin/libbuiltin_getname.c14
-rw-r--r--nuttx/binfmt/libbuiltin/libbuiltin_isavail.c7
2 files changed, 13 insertions, 8 deletions
diff --git a/nuttx/binfmt/libbuiltin/libbuiltin_getname.c b/nuttx/binfmt/libbuiltin/libbuiltin_getname.c
index 01ac024f7..9da2bac29 100644
--- a/nuttx/binfmt/libbuiltin/libbuiltin_getname.c
+++ b/nuttx/binfmt/libbuiltin/libbuiltin_getname.c
@@ -83,10 +83,14 @@
FAR const char *builtin_getname(int index)
{
- if (index < 0 || index >= number_builtins())
- {
- return NULL;
- }
+ struct builtin_s *b;
- return g_builtins[index].name;
+ b = builtin_for_index(index);
+
+ if (b != NULL)
+ {
+ return b->name;
+ }
+
+ return NULL;
}
diff --git a/nuttx/binfmt/libbuiltin/libbuiltin_isavail.c b/nuttx/binfmt/libbuiltin/libbuiltin_isavail.c
index f99a4b81d..b1d55ff21 100644
--- a/nuttx/binfmt/libbuiltin/libbuiltin_isavail.c
+++ b/nuttx/binfmt/libbuiltin/libbuiltin_isavail.c
@@ -80,18 +80,19 @@
* Name: builtin_isavail
*
* Description:
- * Return the index into the table of applications for the applicaiton with
+ * Return the index into the table of applications for the application with
* the name 'appname'.
*
****************************************************************************/
int builtin_isavail(FAR const char *appname)
{
+ FAR const char *n;
int i;
- for (i = 0; g_builtins[i].name; i++)
+ for (i = 0; n = builtin_getname(i); i++)
{
- if (!strncmp(g_builtins[i].name, appname, NAME_MAX))
+ if (!strncmp(n, appname, NAME_MAX))
{
return i;
}