diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-11-08 15:33:17 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-11-10 22:05:49 +0100 |
| commit | f12e3da6393376ed13370a45995bf1950081a954 (patch) | |
| tree | d93a27cdb6590f2499aea252299f39a0d2616557 | |
| parent | e5d3f812854b23ef5e7e51f96a3f89fa02c093fa (diff) | |
| download | lvm2-f12e3da6393376ed13370a45995bf1950081a954.tar.gz | |
cleanup: gcc warnings
| -rw-r--r-- | daemons/lvmetad/lvmetad-core.c | 2 | ||||
| -rw-r--r-- | libdm/libdm-deptree.c | 2 | ||||
| -rw-r--r-- | python/liblvm.c | 3 | ||||
| -rw-r--r-- | tools/lvmcmdline.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index 5b23a562f..693eb86dc 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -1035,7 +1035,7 @@ static void _dump_pairs(struct buffer *buf, struct dm_hash_table *ht, const char *val = dm_hash_get_data(ht, n); buffer_append(buf, " "); if (int_key) - (void) dm_asprintf(&append, "%d = \"%s\"", *(int*)key, val); + (void) dm_asprintf(&append, "%d = \"%s\"", *(const int*)key, val); else (void) dm_asprintf(&append, "%s = \"%s\"", key, val); if (append) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 6521360b1..70373a2b0 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -3176,7 +3176,7 @@ int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, uint64_t size, struct dm_tree_node_raid_params *p) { - int i; + unsigned i; struct load_segment *seg = NULL; for (i = 0; i < DM_ARRAY_SIZE(_dm_segtypes) && !seg; ++i) diff --git a/python/liblvm.c b/python/liblvm.c index 998313576..1b0942db5 100644 --- a/python/liblvm.c +++ b/python/liblvm.c @@ -1986,6 +1986,7 @@ static void _liblvm_cleanup(void) } } +PyMODINIT_FUNC initlvm(void); PyMODINIT_FUNC initlvm(void) { PyObject *m; @@ -2020,7 +2021,7 @@ PyMODINIT_FUNC initlvm(void) LVM_THIN_DISCARDS_PASSDOWN) < 0) return; - if ((_LibLVMError = PyErr_NewException("lvm.LibLVMError", NULL, NULL))) { + if ((_LibLVMError = PyErr_NewException((char*)"lvm.LibLVMError", NULL, NULL))) { /* Each call to PyModule_AddObject decrefs it; compensate: */ Py_INCREF(_LibLVMError); Py_INCREF(_LibLVMError); diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index ce45eb440..6149dbc52 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1500,8 +1500,8 @@ int lvm_return_code(int ret) int lvm_split(char *str, int *argc, char **argv, int max) { char *b = str, *e; - *argc = 0; char quote = 0; + *argc = 0; while (*b) { while (*b && isspace(*b)) |