Pedantic test fixes from failgrind.

pull/1600/head
Roger A. Light 6 years ago
parent 0e9b3dff5b
commit a37941647e

@ -451,14 +451,19 @@ static void missing_read_helper(mosquitto_property *proplist)
CU_ASSERT_EQUAL(int32_value, 1800); CU_ASSERT_EQUAL(int32_value, 1800);
/* MISSING */ /* MISSING */
value = NULL;
prop = mosquitto_property_read_string(proplist, MQTT_PROP_CONTENT_TYPE, &value, false); prop = mosquitto_property_read_string(proplist, MQTT_PROP_CONTENT_TYPE, &value, false);
CU_ASSERT_PTR_NULL(prop); CU_ASSERT_PTR_NULL(prop);
/* NOT MISSING */ /* NOT MISSING */
value = NULL;
prop = mosquitto_property_read_string(proplist, MQTT_PROP_RESPONSE_TOPIC, &value, false); prop = mosquitto_property_read_string(proplist, MQTT_PROP_RESPONSE_TOPIC, &value, false);
CU_ASSERT_PTR_NOT_NULL(prop); CU_ASSERT_PTR_NOT_NULL(prop);
CU_ASSERT_STRING_EQUAL(value, "response/topic"); CU_ASSERT_PTR_NOT_NULL(value);
free(value); if(value){
CU_ASSERT_STRING_EQUAL(value, "response/topic");
free(value);
}
/* MISSING */ /* MISSING */
prop = mosquitto_property_read_binary(proplist, MQTT_PROP_CORRELATION_DATA, (void **)&value, &length, false); prop = mosquitto_property_read_binary(proplist, MQTT_PROP_CORRELATION_DATA, (void **)&value, &length, false);
@ -474,21 +479,29 @@ static void missing_read_helper(mosquitto_property *proplist)
CU_ASSERT_PTR_NULL(prop); CU_ASSERT_PTR_NULL(prop);
/* NOT MISSING */ /* NOT MISSING */
value = NULL;
prop = mosquitto_property_read_string(proplist, MQTT_PROP_SERVER_REFERENCE, &value, false); prop = mosquitto_property_read_string(proplist, MQTT_PROP_SERVER_REFERENCE, &value, false);
CU_ASSERT_PTR_NOT_NULL(prop); CU_ASSERT_PTR_NOT_NULL(prop);
CU_ASSERT_STRING_EQUAL(value, "localhost"); CU_ASSERT_PTR_NOT_NULL(value);
free(value); if(value){
CU_ASSERT_STRING_EQUAL(value, "localhost");
free(value);
}
/* MISSING */ /* MISSING */
prop = mosquitto_property_read_int32(proplist, MQTT_PROP_SESSION_EXPIRY_INTERVAL, &int32_value, false); prop = mosquitto_property_read_int32(proplist, MQTT_PROP_SESSION_EXPIRY_INTERVAL, &int32_value, false);
CU_ASSERT_PTR_NULL(prop); CU_ASSERT_PTR_NULL(prop);
/* NOT MISSING */ /* NOT MISSING */
value = NULL;
prop = mosquitto_property_read_binary(proplist, MQTT_PROP_AUTHENTICATION_DATA, (void **)&value, &length, false); prop = mosquitto_property_read_binary(proplist, MQTT_PROP_AUTHENTICATION_DATA, (void **)&value, &length, false);
CU_ASSERT_PTR_NOT_NULL(prop); CU_ASSERT_PTR_NOT_NULL(prop);
CU_ASSERT_NSTRING_EQUAL(value, "password", strlen("password")); CU_ASSERT_PTR_NOT_NULL(value);
CU_ASSERT_EQUAL(length, strlen("password")); if(value){
free(value); CU_ASSERT_NSTRING_EQUAL(value, "password", strlen("password"));
CU_ASSERT_EQUAL(length, strlen("password"));
free(value);
}
/* MISSING */ /* MISSING */
prop = mosquitto_property_read_int16(proplist, MQTT_PROP_SERVER_KEEP_ALIVE, &int16_value, false); prop = mosquitto_property_read_int16(proplist, MQTT_PROP_SERVER_KEEP_ALIVE, &int16_value, false);

Loading…
Cancel
Save