Working toward compiler independence: Removed inline funcs

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@15 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 15 insertions, 31 deletions

diff --git a/nuttx/fs/fs_dup.c b/nuttx/fs/fs_dup.c
index 02a62daf6..114f4b951 100644
--- a/nuttx/fs/fs_dup.c
+++ b/nuttx/fs/fs_dup.c
@@ -55,23 +55,14 @@
  * Definitions
  ************************************************************/
 
+#define DUP_ISOPEN(fd, list) \
+  ((unsigned int)fd < CONFIG_NFILE_DESCRIPTORS && \
+   list->fl_files[fd].f_inode != NULL)
+
 /************************************************************
  * Private Functions
  ************************************************************/
 
-static inline boolean dup_isopen(int fd, struct filelist *list)
-{
-  if ((unsigned int)fd >= CONFIG_NFILE_DESCRIPTORS ||
-       list->fl_files[fd].f_inode == NULL)
-    {
-      return FALSE;
-    }
-  else
-    {
-      return TRUE;
-    }
-}
-
 /************************************************************
  * Global Functions
  ************************************************************/
@@ -92,7 +83,7 @@ int dup(int fildes)
 
  /* Verify that fildes is a valid, open file descriptor */
 
-  if (!dup_isopen(fildes, list))
+  if (!DUP_ISOPEN(fildes, list))
     {
       *get_errno_ptr() = EBADF;
       return ERROR;
@@ -131,7 +122,7 @@ int dup2(int fildes1, int fildes2)
 
  /* Verify that fildes is a valid, open file descriptor */
 
-  if (!dup_isopen(fildes1, list))
+  if (!DUP_ISOPEN(fildes1, list))
     {
       *get_errno_ptr() = EBADF;
       return ERROR;
diff --git a/nuttx/fs/fs_files.c b/nuttx/fs/fs_files.c
index 7ffede460..a280f9210 100644
--- a/nuttx/fs/fs_files.c
+++ b/nuttx/fs/fs_files.c
@@ -86,10 +86,7 @@ static void _files_semtake(struct filelist *list)
     }
 }
 
-static inline void _files_semgive(struct filelist *list)
-{
-  sem_post(&list->fl_sem);
-}
+#define _files_semgive(list) sem_post(&list->fl_sem)
 
 /************************************************************
  * Pulblic Functions
diff --git a/nuttx/fs/fs_inode.c b/nuttx/fs/fs_inode.c
index b080a4e43..db7451d30 100644
--- a/nuttx/fs/fs_inode.c
+++ b/nuttx/fs/fs_inode.c
@@ -53,9 +53,12 @@
 #include "fs_internal.h"
 
 /************************************************************
- * Private types
+ * Definitions
  ************************************************************/
 
+#define INODE_SEMGIVE() \
+  sem_post(&tree_sem)
+
 /************************************************************
  * Private Variables
  ************************************************************/
@@ -86,10 +89,7 @@ static void _inode_semtake(void)
     }
 }
 
-static inline void _inode_semgive(void)
-{
-  sem_post(&tree_sem);
-}
+#define _inode_semgive(void) sem_post(&tree_sem)
 
 static int _inode_compare(const char *fname,
                            struct inode *node)
@@ -152,20 +152,20 @@ static int _inode_compare(const char *fname,
     }
 }
 
-static inline int _inode_namelen(const char *name)
+static int _inode_namelen(const char *name)
 {
   const char *tmp = name;
   while(*tmp && *tmp != '/') tmp++;
   return tmp - name;
 }
 
-static inline void _inode_namecpy(char *dest, const char *src)
+static void _inode_namecpy(char *dest, const char *src)
 {
   while(*src && *src != '/') *dest++ = *src++;
   *dest='\0';
 }
 
-static inline const char *_inode_nextname(const char *name)
+static const char *_inode_nextname(const char *name)
 {
    while (*name && *name != '/') name++;
    if (*name) name++;
diff --git a/nuttx/fs/fs_internal.h b/nuttx/fs/fs_internal.h
index 14265895f..e8e8a33c9 100644
--- a/nuttx/fs/fs_internal.h
+++ b/nuttx/fs/fs_internal.h
@@ -64,10 +64,6 @@ extern struct file files[CONFIG_NFILE_DESCRIPTORS];
 extern struct inode *root_inode;
 
 /************************************************************
- * Inline Functions
- ************************************************************/
-
-/************************************************************
  * Pulblic Function Prototypes
  ************************************************************/