Module: check_mk
Branch: master
Commit: 1a03be8fc4c0344b09f92aefacc03f72d1e96b16
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a03be8fc4c034…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Oct 26 11:09:27 2015 +0100
Warning police: Added missing return values, fixing a bug in DynamicColumn on the way.
---
livestatus/src/DynamicColumn.cc | 2 +-
livestatus/src/HostSpecialIntColumn.cc | 3 ++-
livestatus/src/StatusSpecialIntColumn.cc | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc
index b789a17..4054daa 100644
--- a/livestatus/src/DynamicColumn.cc
+++ b/livestatus/src/DynamicColumn.cc
@@ -26,6 +26,6 @@
Column *DynamicColumn::createColumn(const char *arguments)
{
- createColumn(_indirect_offset, arguments);
+ return createColumn(_indirect_offset, arguments);
}
diff --git a/livestatus/src/HostSpecialIntColumn.cc
b/livestatus/src/HostSpecialIntColumn.cc
index f1dc6dd..61b9da4 100644
--- a/livestatus/src/HostSpecialIntColumn.cc
+++ b/livestatus/src/HostSpecialIntColumn.cc
@@ -49,5 +49,6 @@ int32_t HostSpecialIntColumn::getValue(void *data, Query *)
return mk_inventory_last(hst->name);
}
- // never reached
+ // never reached, make -Wall happy
+ return 0;
}
diff --git a/livestatus/src/StatusSpecialIntColumn.cc
b/livestatus/src/StatusSpecialIntColumn.cc
index e0bad01..7294c5a 100644
--- a/livestatus/src/StatusSpecialIntColumn.cc
+++ b/livestatus/src/StatusSpecialIntColumn.cc
@@ -32,5 +32,6 @@ int32_t StatusSpecialIntColumn::getValue(void *, Query *)
case SPIC_MK_INVENTORY_LAST:
return mk_inventory_last_of_all();
}
- // never reached
+ // never reached, make -Wall happy
+ return 0;
}