Merge remote-tracking branch 'upstream/master'

lategoodbye · Feb 22, 2014 · ea9ad32 · ea9ad32
2 parents 1afa9a4 + 57fceeb
commit ea9ad32
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/mbus/mbus-protocol.c b/mbus/mbus-protocol.c
@@ -2488,7 +2488,7 @@ mbus_data_record_value(mbus_data_record *record)
 //------------------------------------------------------------------------------
 long mbus_data_record_storage_number(mbus_data_record *record)
 {
-	int bit_index;
+	int bit_index = 0;
 	long result = 0;
 	int i;
 
@@ -2506,15 +2506,15 @@ long mbus_data_record_storage_number(mbus_data_record *record)
 		return result;
 	}
 
-	return 0;
+	return -1;
 }
 
 //------------------------------------------------------------------------------
 /// Return the tariff for a variable-length data record
 //------------------------------------------------------------------------------
 long mbus_data_record_tariff(mbus_data_record *record)
 {
-	int bit_index;
+	int bit_index = 0;
 	long result = 0;
 	int i;
 
@@ -2537,7 +2537,7 @@ long mbus_data_record_tariff(mbus_data_record *record)
 //------------------------------------------------------------------------------
 int mbus_data_record_device(mbus_data_record *record)
 {
-	int bit_index;
+	int bit_index = 0;
 	int result = 0;
 	int i;