projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Many build fixes that turned up with GCC 4.6.
[collectd.git]
/
src
/
owniptc
/
libiptc.c
diff --git
a/src/owniptc/libiptc.c
b/src/owniptc/libiptc.c
index
8f0b0f0
..
7e48e18
100644
(file)
--- a/
src/owniptc/libiptc.c
+++ b/
src/owniptc/libiptc.c
@@
-549,7
+549,7
@@
static int iptcc_chain_index_rebuild(TC_HANDLE_T h)
*/
static int iptcc_chain_index_delete_chain(struct chain_head *c, TC_HANDLE_T h)
{
*/
static int iptcc_chain_index_delete_chain(struct chain_head *c, TC_HANDLE_T h)
{
- struct list_head *index_ptr, *
index_ptr2, *
next;
+ struct list_head *index_ptr, *next;
struct chain_head *c2;
unsigned int idx, idx2;
struct chain_head *c2;
unsigned int idx, idx2;
@@
-569,7
+569,7
@@
static int iptcc_chain_index_delete_chain(struct chain_head *c, TC_HANDLE_T h)
* is located in the same index bucket.
*/
c2 = list_entry(next, struct chain_head, list);
* is located in the same index bucket.
*/
c2 = list_entry(next, struct chain_head, list);
- i
ndex_ptr2 = i
ptcc_bsearch_chain_index(c2->name, &idx2, h);
+ iptcc_bsearch_chain_index(c2->name, &idx2, h);
if (idx != idx2) {
/* Rebuild needed */
return iptcc_chain_index_rebuild(h);
if (idx != idx2) {
/* Rebuild needed */
return iptcc_chain_index_rebuild(h);
@@
-1192,10
+1192,8
@@
static int iptcc_compile_table(TC_HANDLE_T h, STRUCT_REPLACE *repl)
static TC_HANDLE_T
alloc_handle(const char *tablename, unsigned int size, unsigned int num_rules)
{
static TC_HANDLE_T
alloc_handle(const char *tablename, unsigned int size, unsigned int num_rules)
{
- size_t len;
TC_HANDLE_T h;
TC_HANDLE_T h;
- len = sizeof(STRUCT_TC_HANDLE) + size;
h = malloc(sizeof(STRUCT_TC_HANDLE));
if (!h) {
h = malloc(sizeof(STRUCT_TC_HANDLE));
if (!h) {