diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2012-11-21 14:07:05 +0530 | 
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-01-21 22:17:36 -0800 | 
| commit | 777d395feaa082a69e32d985bbc1cca3d3dad077 (patch) | |
| tree | 0aa6c1a1390320bd8ac674e14ca1c3da58c39927 /libglusterfs | |
| parent | 6e18e3bd81f8dac9467aaa6cbe84499b891ca367 (diff) | |
core: fixes for gcc's '-pedantic' flag build
* warnings on 'void *' arguments
* warnings on empty initializations
* warnings on empty array (array[0])
Change-Id: Iae440f54cbd59580eb69f3ecaed5a9926c0edf95
BUG: 875913
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/4219
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/gf-dirent.h | 2 | ||||
| -rw-r--r-- | libglusterfs/src/latency.c | 82 | ||||
| -rw-r--r-- | libglusterfs/src/syncop.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/xlator.c | 10 | 
4 files changed, 48 insertions, 48 deletions
diff --git a/libglusterfs/src/gf-dirent.h b/libglusterfs/src/gf-dirent.h index 26cb5a66872..588d522dbcf 100644 --- a/libglusterfs/src/gf-dirent.h +++ b/libglusterfs/src/gf-dirent.h @@ -45,7 +45,7 @@ struct _gf_dirent_t {          struct iatt                          d_stat;          dict_t                              *dict;          inode_t                             *inode; -	char                                 d_name[0]; +	char                                 d_name[];  };  #define DT_ISDIR(mode) (mode == DT_DIR) diff --git a/libglusterfs/src/latency.c b/libglusterfs/src/latency.c index f143a8e4684..9fe76efa040 100644 --- a/libglusterfs/src/latency.c +++ b/libglusterfs/src/latency.c @@ -26,87 +26,87 @@ gf_set_fop_from_fn_pointer (call_frame_t *frame, struct xlator_fops *fops, void  {          glusterfs_fop_t fop = -1; -        if (fops->stat == fn) +        if (fops->stat == *(fop_stat_t *)fn)                  fop = GF_FOP_STAT; -        else if (fops->readlink == fn) +        else if (fops->readlink == *(fop_readlink_t *)fn)                  fop = GF_FOP_READLINK; -        else if (fops->mknod == fn) +        else if (fops->mknod == *(fop_mknod_t *)fn)                  fop = GF_FOP_MKNOD; -        else if (fops->mkdir == fn) +        else if (fops->mkdir == *(fop_mkdir_t *)fn)                  fop = GF_FOP_MKDIR; -        else if (fops->unlink == fn) +        else if (fops->unlink == *(fop_unlink_t *)fn)                  fop = GF_FOP_UNLINK; -        else if (fops->rmdir == fn) +        else if (fops->rmdir == *(fop_rmdir_t *)fn)                  fop = GF_FOP_RMDIR; -        else if (fops->symlink == fn) +        else if (fops->symlink == *(fop_symlink_t *)fn)                  fop = GF_FOP_SYMLINK; -        else if (fops->rename == fn) +        else if (fops->rename == *(fop_rename_t *)fn)                  fop = GF_FOP_RENAME; -        else if (fops->link == fn) +        else if (fops->link == *(fop_link_t *)fn)                  fop = GF_FOP_LINK; -        else if (fops->truncate == fn) +        else if (fops->truncate == *(fop_truncate_t *)fn)                  fop = GF_FOP_TRUNCATE; -        else if (fops->open == fn) +        else if (fops->open == *(fop_open_t *)fn)                  fop = GF_FOP_OPEN; -        else if (fops->readv == fn) +        else if (fops->readv == *(fop_readv_t *)fn)                  fop = GF_FOP_READ; -        else if (fops->writev == fn) +        else if (fops->writev == *(fop_writev_t *)fn)                  fop = GF_FOP_WRITE; -        else if (fops->statfs == fn) +        else if (fops->statfs == *(fop_statfs_t *)fn)                  fop = GF_FOP_STATFS; -        else if (fops->flush == fn) +        else if (fops->flush == *(fop_flush_t *)fn)                  fop = GF_FOP_FLUSH; -        else if (fops->fsync == fn) +        else if (fops->fsync == *(fop_fsync_t *)fn)                  fop = GF_FOP_FSYNC; -        else if (fops->setxattr == fn) +        else if (fops->setxattr == *(fop_setxattr_t *)fn)                  fop = GF_FOP_SETXATTR; -        else if (fops->getxattr == fn) +        else if (fops->getxattr == *(fop_getxattr_t *)fn)                  fop = GF_FOP_GETXATTR; -        else if (fops->removexattr == fn) +        else if (fops->removexattr == *(fop_removexattr_t *)fn)                  fop = GF_FOP_REMOVEXATTR; -        else if (fops->opendir == fn) +        else if (fops->opendir == *(fop_opendir_t *)fn)                  fop = GF_FOP_OPENDIR; -        else if (fops->fsyncdir == fn) +        else if (fops->fsyncdir == *(fop_fsyncdir_t *)fn)                  fop = GF_FOP_FSYNCDIR; -        else if (fops->access == fn) +        else if (fops->access == *(fop_access_t *)fn)                  fop = GF_FOP_ACCESS; -        else if (fops->create == fn) +        else if (fops->create == *(fop_create_t *)fn)                  fop = GF_FOP_CREATE; -        else if (fops->ftruncate == fn) +        else if (fops->ftruncate == *(fop_ftruncate_t *)fn)                  fop = GF_FOP_FTRUNCATE; -        else if (fops->fstat == fn) +        else if (fops->fstat == *(fop_fstat_t *)fn)                  fop = GF_FOP_FSTAT; -        else if (fops->lk == fn) +        else if (fops->lk == *(fop_lk_t *)fn)                  fop = GF_FOP_LK; -        else if (fops->lookup == fn) +        else if (fops->lookup == *(fop_lookup_t *)fn)                  fop = GF_FOP_LOOKUP; -        else if (fops->readdir == fn) +        else if (fops->readdir == *(fop_readdir_t *)fn)                  fop = GF_FOP_READDIR; -        else if (fops->inodelk == fn) +        else if (fops->inodelk == *(fop_inodelk_t *)fn)                  fop = GF_FOP_INODELK; -        else if (fops->finodelk == fn) +        else if (fops->finodelk == *(fop_finodelk_t *)fn)                  fop = GF_FOP_FINODELK; -        else if (fops->entrylk == fn) +        else if (fops->entrylk == *(fop_entrylk_t *)fn)                  fop = GF_FOP_ENTRYLK; -        else if (fops->fentrylk == fn) +        else if (fops->fentrylk == *(fop_fentrylk_t *)fn)                  fop = GF_FOP_FENTRYLK; -        else if (fops->xattrop == fn) +        else if (fops->xattrop == *(fop_xattrop_t *)fn)                  fop = GF_FOP_XATTROP; -        else if (fops->fxattrop == fn) +        else if (fops->fxattrop == *(fop_fxattrop_t *)fn)                  fop = GF_FOP_FXATTROP; -        else if (fops->fgetxattr == fn) +        else if (fops->fgetxattr == *(fop_fgetxattr_t *)fn)                  fop = GF_FOP_FGETXATTR; -        else if (fops->fsetxattr == fn) +        else if (fops->fsetxattr == *(fop_fsetxattr_t *)fn)                  fop = GF_FOP_FSETXATTR; -        else if (fops->rchecksum == fn) +        else if (fops->rchecksum == *(fop_rchecksum_t *)fn)                  fop = GF_FOP_RCHECKSUM; -        else if (fops->setattr == fn) +        else if (fops->setattr == *(fop_setattr_t *)fn)                  fop = GF_FOP_SETATTR; -        else if (fops->fsetattr == fn) +        else if (fops->fsetattr == *(fop_fsetattr_t *)fn)                  fop = GF_FOP_FSETATTR; -        else if (fops->readdirp == fn) +        else if (fops->readdirp == *(fop_readdirp_t *)fn)                  fop = GF_FOP_READDIRP; -        else if (fops->getspec == fn) +        else if (fops->getspec == *(fop_getspec_t *)fn)                  fop = GF_FOP_GETSPEC;          else                  fop = -1; diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index 471ae1e05ef..0c807ef5d3a 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -220,7 +220,7 @@ synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk,          newtask->ctx.uc_stack.ss_sp   = newtask->stack;          newtask->ctx.uc_stack.ss_size = env->stacksize; -        makecontext (&newtask->ctx, (void *) synctask_wrap, 2, newtask); +        makecontext (&newtask->ctx, (void (*)(void)) synctask_wrap, 2, newtask);  	newtask->state = SYNCTASK_INIT; diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index b42bc3bcc83..22c81f81b88 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -218,19 +218,19 @@ xlator_dynload (xlator_t *xl)                  goto out;          } -        if (!(xl->init = dlsym (handle, "init"))) { +        if (!(*VOID(&xl->init) = dlsym (handle, "init"))) {                  gf_log ("xlator", GF_LOG_WARNING, "dlsym(init) on %s",                          dlerror ());                  goto out;          } -        if (!(xl->fini = dlsym (handle, "fini"))) { +        if (!(*VOID(&(xl->fini)) = dlsym (handle, "fini"))) {                  gf_log ("xlator", GF_LOG_WARNING, "dlsym(fini) on %s",                          dlerror ());                  goto out;          } -        if (!(xl->notify = dlsym (handle, "notify"))) { +        if (!(*VOID(&(xl->notify)) = dlsym (handle, "notify"))) {                  gf_log ("xlator", GF_LOG_TRACE,                          "dlsym(notify) on %s -- neglecting", dlerror ());          } @@ -240,13 +240,13 @@ xlator_dynload (xlator_t *xl)                          "dlsym(dumpops) on %s -- neglecting", dlerror ());          } -        if (!(xl->mem_acct_init = dlsym (handle, "mem_acct_init"))) { +        if (!(*VOID(&(xl->mem_acct_init)) = dlsym (handle, "mem_acct_init"))) {                  gf_log (xl->name, GF_LOG_TRACE,                          "dlsym(mem_acct_init) on %s -- neglecting",                          dlerror ());          } -        if (!(xl->reconfigure = dlsym (handle, "reconfigure"))) { +        if (!(*VOID(&(xl->reconfigure)) = dlsym (handle, "reconfigure"))) {                  gf_log ("xlator", GF_LOG_TRACE,                          "dlsym(reconfigure) on %s -- neglecting",                          dlerror());  | 
