diff options
Diffstat (limited to 'nuttx/fs')
| -rw-r--r-- | nuttx/fs/fat/fs_fat32.h | 12 | ||||
| -rw-r--r-- | nuttx/fs/fat/fs_fat32attrib.c | 38 | ||||
| -rw-r--r-- | nuttx/fs/fs_closeblockdriver.c | 3 | ||||
| -rw-r--r-- | nuttx/fs/fs_findblockdriver.c | 3 | ||||
| -rw-r--r-- | nuttx/fs/fs_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/fs/fs_openblockdriver.c | 2 |
6 files changed, 30 insertions, 30 deletions
diff --git a/nuttx/fs/fat/fs_fat32.h b/nuttx/fs/fat/fs_fat32.h index ab48fa796..f72b0f4e4 100644 --- a/nuttx/fs/fat/fs_fat32.h +++ b/nuttx/fs/fat/fs_fat32.h @@ -1,5 +1,5 @@ /**************************************************************************** - * fs_fat32.h + * fs/fat/fs_fat32.h * * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __FS_FAT_H -#define __FS_FAT_H +#ifndef __FS_FAT_FS_FAT32_H +#define __FS_FAT_FS_FAT32_H /**************************************************************************** * Included Files @@ -93,7 +93,7 @@ #define BS32_BKBOOTSEC 50 /* 2@50: Sector number of boot record. Usually 6 */ /* 12@52: Reserved (zero) */ #define BS32_DRVNUM 64 /* 1@64: Drive number for MSDOS bootstrap */ - /* 1@65: Reserverd (zero) */ + /* 1@65: Reserved (zero) */ #define BS32_BOOTSIG 66 /* 1@66: Extended boot signature: 0x29 if following valid */ #define BS32_VOLID 67 /* 4@67: Volume serial number */ #define BS32_VOLLAB 71 /* 11@71: Volume label */ @@ -497,7 +497,7 @@ struct fat_dirinfo_s ****************************************************************************/ /**************************************************************************** - * Pulblic Function Prototypes + * Public Function Prototypes ****************************************************************************/ #undef EXTERN @@ -581,4 +581,4 @@ EXTERN int fat_nfreeclusters(struct fat_mountpt_s *fs, size_t *pfreeclusters); } #endif -#endif /* __FS_FAT32_H */ +#endif /* __FS_FAT_FS_FAT32_H */ diff --git a/nuttx/fs/fat/fs_fat32attrib.c b/nuttx/fs/fat/fs_fat32attrib.c index 7537fbf98..dee01102c 100644 --- a/nuttx/fs/fat/fs_fat32attrib.c +++ b/nuttx/fs/fat/fs_fat32attrib.c @@ -1,7 +1,7 @@ -/************************************************************ - * fs_fat32attrib.c +/**************************************************************************** + * fs/fat/fs_fat32attrib.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,15 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ -/************************************************************ - * Compilation Switches - ************************************************************/ - -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include <nuttx/config.h> #include <sys/types.h> @@ -51,13 +47,13 @@ #include "fs_internal.h" #include "fs_fat32.h" -/************************************************************ +/**************************************************************************** * Private Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Name: fat_attrib - ************************************************************/ + ****************************************************************************/ static int fat_attrib(const char *path, fat_attrib_t *retattrib, fat_attrib_t setbits, fat_attrib_t clearbits) @@ -166,22 +162,22 @@ errout: return ERROR; } -/************************************************************ +/**************************************************************************** * Global Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Name: fat_getattrib - ************************************************************/ + ****************************************************************************/ int fat_getattrib(const char *path, fat_attrib_t *attrib) { return fat_attrib(path, attrib, 0, 0); } -/************************************************************ +/**************************************************************************** * Name: fat_setattrib - ************************************************************/ + ****************************************************************************/ int fat_setattrib(const char *path, fat_attrib_t setbits, fat_attrib_t clearbits) { diff --git a/nuttx/fs/fs_closeblockdriver.c b/nuttx/fs/fs_closeblockdriver.c index 3370dfeba..62f1e991b 100644 --- a/nuttx/fs/fs_closeblockdriver.c +++ b/nuttx/fs/fs_closeblockdriver.c @@ -75,12 +75,13 @@ int close_blockdriver(FAR struct inode *inode) int ret = 0; /* Assume success */ /* Sanity checks */ - +#ifdef CONFIG_DEBUG if (!inode || !inode->u.i_bops) { ret = -EINVAL; goto errout; } +#endif /* Verify that the inode is a block driver. */ diff --git a/nuttx/fs/fs_findblockdriver.c b/nuttx/fs/fs_findblockdriver.c index b7c335a61..b2b4606df 100644 --- a/nuttx/fs/fs_findblockdriver.c +++ b/nuttx/fs/fs_findblockdriver.c @@ -83,12 +83,13 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode int ret = 0; /* Assume success */ /* Sanity checks */ - +#ifdef CONFIG_DEBUG if (!pathname || !ppinode) { ret = -EINVAL; goto errout; } +#endif /* Find the inode registered with this pathname */ diff --git a/nuttx/fs/fs_internal.h b/nuttx/fs/fs_internal.h index 0f16b14fa..c09716943 100644 --- a/nuttx/fs/fs_internal.h +++ b/nuttx/fs/fs_internal.h @@ -163,7 +163,7 @@ struct internal_dir_s extern FAR struct inode *root_inode; /**************************************************************************** - * Pulblic Function Prototypes + * Public Function Prototypes ****************************************************************************/ #undef EXTERN diff --git a/nuttx/fs/fs_openblockdriver.c b/nuttx/fs/fs_openblockdriver.c index b50ee2cfa..94f2c8a8c 100644 --- a/nuttx/fs/fs_openblockdriver.c +++ b/nuttx/fs/fs_openblockdriver.c @@ -82,12 +82,14 @@ int open_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode int ret; /* Minimal sanity checks */ +#ifdef CONFIG_DEBUG if (!ppinode) { ret = -EINVAL; goto errout; } +#endif /* Find the inode associated with this block driver name. find_blockdriver * will perform all additional error checking. |