version 1.1.1.1.2.14, 2011/12/05 16:55:40
|
version 1.1.1.1.2.16, 2011/12/13 10:12:36
|
Line 261 mqtt_str2sub(const char **csStr, u_short strnum, u_cha
|
Line 261 mqtt_str2sub(const char **csStr, u_short strnum, u_cha
|
|
|
for (i = 0; i < items; i++) { |
for (i = 0; i < items; i++) { |
v[i].sub_topic._size = strlen(csStr[i]); |
v[i].sub_topic._size = strlen(csStr[i]); |
v[i].sub_topic._base = strdup(csStr[i]); | v[i].sub_topic._base = (u_char*) strdup(csStr[i]); |
if (qoses && qoses[i] < MQTT_QOS_RESERVED) |
if (qoses && qoses[i] < MQTT_QOS_RESERVED) |
v[i].sub_ret = qoses[i]; |
v[i].sub_ret = qoses[i]; |
} |
} |
Line 316 mqtt_subAlloc(u_short num)
|
Line 316 mqtt_subAlloc(u_short num)
|
return NULL; |
return NULL; |
} else |
} else |
memset(s, 0, (num + 1) * sizeof(mqtt_subscr_t)); |
memset(s, 0, (num + 1) * sizeof(mqtt_subscr_t)); |
|
|
|
return s; |
|
} |
|
|
|
/* |
|
* mqtt_subRealloc() Reallocate array from subscribe variables |
|
* |
|
* @subs = Subscribe array |
|
* @num = Number of elements |
|
* return: NULL error or subscribe array, after use must call mqtt_subFree() |
|
*/ |
|
inline mqtt_subscr_t * |
|
mqtt_subRealloc(mqtt_subscr_t * __restrict subs, u_short num) |
|
{ |
|
mqtt_subscr_t *s = NULL; |
|
|
|
s = realloc(subs, (num + 1) * sizeof(mqtt_subscr_t)); |
|
if (!s) { |
|
LOGERR; |
|
return NULL; |
|
} |
|
|
return s; |
return s; |
} |
} |