[Ocfs2-tools-commits] manish commits r886 - in trunk: extras
fsck.ocfs2 libocfs2 libocfs2/include mkfs.ocfs2 mounted.ocfs2
o2cb_ctl ocfs2_hb_ctl ocfs2cdsl tunefs.ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu May 12 17:30:27 CDT 2005
Author: manish
Date: 2005-05-12 17:30:26 -0500 (Thu, 12 May 2005)
New Revision: 886
Modified:
trunk/extras/decode_lockres.c
trunk/fsck.ocfs2/pass1.c
trunk/libocfs2/dirblock.c
trunk/libocfs2/dlm.c
trunk/libocfs2/include/ocfs2_fs.h
trunk/libocfs2/inode_scan.c
trunk/libocfs2/link.c
trunk/mkfs.ocfs2/mkfs.c
trunk/mounted.ocfs2/mounted.c
trunk/o2cb_ctl/jconfig.c
trunk/ocfs2_hb_ctl/ocfs2_hb_ctl.c
trunk/ocfs2cdsl/ocfs2cdsl.c
trunk/tunefs.ocfs2/tunefs.c
Log:
Some cleanups found by sparse
Modified: trunk/extras/decode_lockres.c
===================================================================
--- trunk/extras/decode_lockres.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/extras/decode_lockres.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -49,16 +49,16 @@
#define OCFS2_LOCK_ID_PAD "000000"
static char ocfs2_lock_type_char[OCFS_NUM_LOCK_TYPES] = {
- [OCFS_TYPE_META] 'M',
- [OCFS_TYPE_DATA] 'D',
- [OCFS_TYPE_SUPER] 'S'
+ [OCFS_TYPE_META] = 'M',
+ [OCFS_TYPE_DATA] = 'D',
+ [OCFS_TYPE_SUPER] = 'S'
};
/* End paste from kernel module */
static char * ocfs2_lock_type_string[OCFS_NUM_LOCK_TYPES] = {
- [OCFS_TYPE_META] "Metadata",
- [OCFS_TYPE_DATA] "Data",
- [OCFS_TYPE_SUPER] "Superblock"
+ [OCFS_TYPE_META] = "Metadata",
+ [OCFS_TYPE_DATA] = "Data",
+ [OCFS_TYPE_SUPER] = "Superblock"
};
static void usage(char *program)
Modified: trunk/fsck.ocfs2/pass1.c
===================================================================
--- trunk/fsck.ocfs2/pass1.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/fsck.ocfs2/pass1.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -670,7 +670,7 @@
di->i_links_count = 0;
o2fsck_icount_set(ost->ost_icount_in_inodes, di->i_blkno,
di->i_links_count);
- di->i_dtime = time(0);
+ di->i_dtime = time(NULL);
o2fsck_write_inode(ost, di->i_blkno, di);
/* XXX clear valid flag and stuff? */
}
Modified: trunk/libocfs2/dirblock.c
===================================================================
--- trunk/libocfs2/dirblock.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/libocfs2/dirblock.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -73,7 +73,7 @@
{
errcode_t retval;
char *p, *end;
- char *buf = 0;
+ char *buf = NULL;
struct ocfs2_dir_entry *dirent;
retval = ocfs2_malloc_block(fs->fs_io, &buf);
Modified: trunk/libocfs2/dlm.c
===================================================================
--- trunk/libocfs2/dlm.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/libocfs2/dlm.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -44,9 +44,9 @@
};
static char ocfs2_lock_type_char[OCFS_NUM_LOCK_TYPES] = {
- [OCFS_TYPE_META] 'M',
- [OCFS_TYPE_DATA] 'D',
- [OCFS_TYPE_SUPER] 'S'
+ [OCFS_TYPE_META] = 'M',
+ [OCFS_TYPE_DATA] = 'D',
+ [OCFS_TYPE_SUPER] = 'S'
};
static void ocfs2_build_lock_name(ocfs2_filesys *fs, enum ocfs2_lock_type type,
Modified: trunk/libocfs2/include/ocfs2_fs.h
===================================================================
--- trunk/libocfs2/include/ocfs2_fs.h 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/libocfs2/include/ocfs2_fs.h 2005-05-12 22:30:26 UTC (rev 886)
@@ -169,20 +169,20 @@
static struct ocfs2_system_inode_info ocfs2_system_inodes[NUM_SYSTEM_INODES] = {
/* Global system inodes (single copy) */
/* The first two are only used from userspace mfks/tunefs */
- [BAD_BLOCK_SYSTEM_INODE] { "bad_blocks", 0, S_IFREG | 0644 },
- [GLOBAL_INODE_ALLOC_SYSTEM_INODE] { "global_inode_alloc", OCFS2_BITMAP_FL | OCFS2_CHAIN_FL, S_IFREG | 0644 },
+ [BAD_BLOCK_SYSTEM_INODE] = { "bad_blocks", 0, S_IFREG | 0644 },
+ [GLOBAL_INODE_ALLOC_SYSTEM_INODE] = { "global_inode_alloc", OCFS2_BITMAP_FL | OCFS2_CHAIN_FL, S_IFREG | 0644 },
/* These are used by the running filesystem */
- [SLOT_MAP_SYSTEM_INODE] { "slot_map", 0, S_IFREG | 0644 },
- [HEARTBEAT_SYSTEM_INODE] { "heartbeat", OCFS2_HEARTBEAT_FL, S_IFREG | 0644 },
- [GLOBAL_BITMAP_SYSTEM_INODE] { "global_bitmap", 0, S_IFREG | 0644 },
+ [SLOT_MAP_SYSTEM_INODE] = { "slot_map", 0, S_IFREG | 0644 },
+ [HEARTBEAT_SYSTEM_INODE] = { "heartbeat", OCFS2_HEARTBEAT_FL, S_IFREG | 0644 },
+ [GLOBAL_BITMAP_SYSTEM_INODE] = { "global_bitmap", 0, S_IFREG | 0644 },
/* Node-specific system inodes (one copy per node) */
- [ORPHAN_DIR_SYSTEM_INODE] { "orphan_dir:%04d", 0, S_IFDIR | 0755 },
- [EXTENT_ALLOC_SYSTEM_INODE] { "extent_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_CHAIN_FL, S_IFREG | 0644 },
- [INODE_ALLOC_SYSTEM_INODE] { "inode_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_CHAIN_FL, S_IFREG | 0644 },
- [JOURNAL_SYSTEM_INODE] { "journal:%04d", OCFS2_JOURNAL_FL, S_IFREG | 0644 },
- [LOCAL_ALLOC_SYSTEM_INODE] { "local_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_LOCAL_ALLOC_FL, S_IFREG | 0644 }
+ [ORPHAN_DIR_SYSTEM_INODE] = { "orphan_dir:%04d", 0, S_IFDIR | 0755 },
+ [EXTENT_ALLOC_SYSTEM_INODE] = { "extent_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_CHAIN_FL, S_IFREG | 0644 },
+ [INODE_ALLOC_SYSTEM_INODE] = { "inode_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_CHAIN_FL, S_IFREG | 0644 },
+ [JOURNAL_SYSTEM_INODE] = { "journal:%04d", OCFS2_JOURNAL_FL, S_IFREG | 0644 },
+ [LOCAL_ALLOC_SYSTEM_INODE] = { "local_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_LOCAL_ALLOC_FL, S_IFREG | 0644 }
};
/* Parameter passed from mount.ocfs2 to module */
@@ -219,13 +219,13 @@
#define S_SHIFT 12
static unsigned char ocfs_type_by_mode[S_IFMT >> S_SHIFT] = {
- [S_IFREG >> S_SHIFT] OCFS2_FT_REG_FILE,
- [S_IFDIR >> S_SHIFT] OCFS2_FT_DIR,
- [S_IFCHR >> S_SHIFT] OCFS2_FT_CHRDEV,
- [S_IFBLK >> S_SHIFT] OCFS2_FT_BLKDEV,
- [S_IFIFO >> S_SHIFT] OCFS2_FT_FIFO,
- [S_IFSOCK >> S_SHIFT] OCFS2_FT_SOCK,
- [S_IFLNK >> S_SHIFT] OCFS2_FT_SYMLINK,
+ [S_IFREG >> S_SHIFT] = OCFS2_FT_REG_FILE,
+ [S_IFDIR >> S_SHIFT] = OCFS2_FT_DIR,
+ [S_IFCHR >> S_SHIFT] = OCFS2_FT_CHRDEV,
+ [S_IFBLK >> S_SHIFT] = OCFS2_FT_BLKDEV,
+ [S_IFIFO >> S_SHIFT] = OCFS2_FT_FIFO,
+ [S_IFSOCK >> S_SHIFT] = OCFS2_FT_SOCK,
+ [S_IFLNK >> S_SHIFT] = OCFS2_FT_SYMLINK,
};
Modified: trunk/libocfs2/inode_scan.c
===================================================================
--- trunk/libocfs2/inode_scan.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/libocfs2/inode_scan.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -211,7 +211,7 @@
scan->next_rec = 0;
scan->count = 0;
scan->cur_blkno = 0;
- scan->cur_rec = 0;
+ scan->cur_rec = NULL;
scan->blocks_left =
cinode->ci_inode->id1.bitmap1.i_total;
Modified: trunk/libocfs2/link.c
===================================================================
--- trunk/libocfs2/link.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/libocfs2/link.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -134,7 +134,7 @@
retval = ocfs2_dir_iterate(fs, dir,
OCFS2_DIRENT_FLAG_INCLUDE_EMPTY,
- 0, link_proc, &ls);
+ NULL, link_proc, &ls);
if (retval)
return retval;
Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/mkfs.ocfs2/mkfs.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -86,7 +86,7 @@
extern char *optarg;
extern int optind, opterr, optopt;
-SystemFileInfo system_files[] = {
+static SystemFileInfo system_files[] = {
{ "bad_blocks", SFI_OTHER, 1, S_IFREG | 0644 },
{ "global_inode_alloc", SFI_CHAIN, 1, S_IFREG | 0644 },
{ "slot_map", SFI_OTHER, 1, S_IFREG | 0644 },
Modified: trunk/mounted.ocfs2/mounted.c
===================================================================
--- trunk/mounted.ocfs2/mounted.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/mounted.ocfs2/mounted.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -41,11 +41,11 @@
#include <ocfs1_fs_compat.h>
#include <kernel-list.h>
-int quick_detect = 0;
-char *device = NULL;
-char *progname = NULL;
+static int quick_detect = 0;
+static char *device = NULL;
+static char *progname = NULL;
-char *usage_string =
+static char *usage_string =
"usage: %s [-d] [-f] [device]\n"
" -d quick detect\n"
" -f full detect\n";
Modified: trunk/o2cb_ctl/jconfig.c
===================================================================
--- trunk/o2cb_ctl/jconfig.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/o2cb_ctl/jconfig.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -185,7 +185,7 @@
*
* Returns a new JConfigCtxt.
*/
-JConfigCtxt *j_config_new_context()
+JConfigCtxt *j_config_new_context(void)
{
JConfigCtxt *cfc;
@@ -790,7 +790,7 @@
*
* Allocates a new JConfig structure
*/
-static JConfig *j_config_config_new()
+static JConfig *j_config_config_new(void)
{
JConfig *cf;
@@ -815,7 +815,7 @@
*
* Allocates a new JConfigStanza structure
*/
-static JConfigStanza *j_config_stanza_new()
+static JConfigStanza *j_config_stanza_new(void)
{
JConfigStanza *cfs;
@@ -1712,7 +1712,7 @@
gchar *output_text;
GString *output;
- g_return_val_if_fail(cf != NULL, FALSE);
+ g_return_val_if_fail(cf != NULL, NULL);
output = g_string_new(NULL);
if (output == NULL)
Modified: trunk/ocfs2_hb_ctl/ocfs2_hb_ctl.c
===================================================================
--- trunk/ocfs2_hb_ctl/ocfs2_hb_ctl.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/ocfs2_hb_ctl/ocfs2_hb_ctl.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -25,7 +25,7 @@
#include "o2cb.h"
-char *progname = "ocfs2_hb_ctl";
+static char *progname = "ocfs2_hb_ctl";
static errcode_t get_uuid(char *dev, char *uuid)
{
Modified: trunk/ocfs2cdsl/ocfs2cdsl.c
===================================================================
--- trunk/ocfs2cdsl/ocfs2cdsl.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/ocfs2cdsl/ocfs2cdsl.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -64,14 +64,14 @@
} CDSLType;
static const char * const cdsl_names[] = {
- [CDSL_TYPE_HOSTNAME] "hostname",
- [CDSL_TYPE_MACH] "mach",
- [CDSL_TYPE_OS] "os",
- [CDSL_TYPE_NODENUM] "mach",
- [CDSL_TYPE_SYS] "sys",
- [CDSL_TYPE_UID] "uid",
- [CDSL_TYPE_GID] "gid",
- [CDSL_TYPE_UNKNOWN] NULL
+ [CDSL_TYPE_HOSTNAME] = "hostname",
+ [CDSL_TYPE_MACH] = "mach",
+ [CDSL_TYPE_OS] = "os",
+ [CDSL_TYPE_NODENUM] = "mach",
+ [CDSL_TYPE_SYS] = "sys",
+ [CDSL_TYPE_UID] = "uid",
+ [CDSL_TYPE_GID] = "gid",
+ [CDSL_TYPE_UNKNOWN] = NULL
};
@@ -519,7 +519,7 @@
cdsl_path_expand(State *s)
{
const char *prefix;
- char *val, *ret;;
+ char *val, *ret;
struct utsname buf;
uname(&buf);
Modified: trunk/tunefs.ocfs2/tunefs.c
===================================================================
--- trunk/tunefs.ocfs2/tunefs.c 2005-05-12 20:41:26 UTC (rev 885)
+++ trunk/tunefs.ocfs2/tunefs.c 2005-05-12 22:30:26 UTC (rev 886)
@@ -80,9 +80,9 @@
int fd;
} ocfs2_tune_opts;
-ocfs2_tune_opts opts;
-ocfs2_filesys *fs_gbl = NULL;
-int cluster_locked = 0;
+static ocfs2_tune_opts opts;
+static ocfs2_filesys *fs_gbl = NULL;
+static int cluster_locked = 0;
static void usage(const char *progname)
{
More information about the Ocfs2-tools-commits
mailing list