mqtt/src/pubmqtt.c - diff

Return to pubmqtt.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/pubmqtt.c between versions 1.2.2.8 and 1.2.2.9

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

version 1.2.2.8, 2012/05/08 14:27:46	version 1.2.2.9, 2012/05/27 10:04:05
Line 435 mqtt_rtlm_read_topic(cfg_root_t cfg, sqlite3 sql, co	Line 435 mqtt_rtlm_read_topic(cfg_root_t cfg, sqlite3 sql, co
/* calculate count of rows and allocate subscribe items */	/* calculate count of rows and allocate subscribe items */
while (sqlite3_step(stmt) == SQLITE_ROW)	while (sqlite3_step(stmt) == SQLITE_ROW)
rowz++;	rowz++;
if (!(s = malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {	if (!(s = io_malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {
mqtt_rtlm_log("Error:: System #%d - %s", errno, strerror(errno));	mqtt_rtlm_log("Error:: System #%d - %s", errno, strerror(errno));
goto end;	goto end;
} else	} else
Line 445 mqtt_rtlm_read_topic(cfg_root_t cfg, sqlite3 sql, co	Line 445 mqtt_rtlm_read_topic(cfg_root_t cfg, sqlite3 sql, co
/* fill with data */	/* fill with data */
for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {	for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {
s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);	s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
s[j].sub_topic.msg_base = (u_char) strdup((char) sqlite3_column_text(stmt, 1));	s[j].sub_topic.msg_base = (u_char) io_strdup((char) sqlite3_column_text(stmt, 1));
s[j].sub_topic.msg_len = strlen((char*) s[j].sub_topic.msg_base);	s[j].sub_topic.msg_len = strlen((char*) s[j].sub_topic.msg_base);
s[j].sub_value.msg_base = (u_char) strdup((char) sqlite3_column_text(stmt, 2));	s[j].sub_value.msg_base = (u_char) io_strdup((char) sqlite3_column_text(stmt, 2));
s[j].sub_value.msg_len = strlen((char*) s[j].sub_value.msg_base);	s[j].sub_value.msg_len = strlen((char*) s[j].sub_value.msg_base);
}	}
end:	end:
Line 590 mqtt_rtlm_read_subscribe(cfg_root_t cfg, sqlite3 sql	Line 590 mqtt_rtlm_read_subscribe(cfg_root_t cfg, sqlite3 sql
/* calculate count of rows and allocate subscribe items */	/* calculate count of rows and allocate subscribe items */
while (sqlite3_step(stmt) == SQLITE_ROW)	while (sqlite3_step(stmt) == SQLITE_ROW)
rowz++;	rowz++;
if (!(s = malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {	if (!(s = io_malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {
mqtt_rtlm_log("Error:: System #%d - %s", errno, strerror(errno));	mqtt_rtlm_log("Error:: System #%d - %s", errno, strerror(errno));
goto end;	goto end;
} else	} else
Line 600 mqtt_rtlm_read_subscribe(cfg_root_t cfg, sqlite3 sql	Line 600 mqtt_rtlm_read_subscribe(cfg_root_t cfg, sqlite3 sql
/* fill with data */	/* fill with data */
for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {	for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {
s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);	s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
s[j].sub_topic.msg_base = (u_char) strdup((char) sqlite3_column_text(stmt, 1));	s[j].sub_topic.msg_base = (u_char) io_strdup((char) sqlite3_column_text(stmt, 1));
s[j].sub_topic.msg_len = strlen((char*) s[j].sub_topic.msg_base);	s[j].sub_topic.msg_len = strlen((char*) s[j].sub_topic.msg_base);
s[j].sub_value.msg_base = NULL;	s[j].sub_value.msg_base = NULL;
s[j].sub_value.msg_len = 0;	s[j].sub_value.msg_len = 0;

Removed from v.1.2.2.8
changed lines
	Added in v.1.2.2.9