The code debugging has not been used/required for years
so left vca_log lines has not beet spotted.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
#include "ul_utmalloc.h"
#include "ul_dbuff.h"
#include "ul_utmalloc.h"
#include "ul_dbuff.h"
+#ifdef UL_DBUFF_LOGGING
+#include "ul_log.h"
+extern UL_LOG_CUST(ulogd_dbuff)
+#endif /*UL_DBUFF_LOGGING*/
+
typedef unsigned char byte;
//#undef DEBUG
typedef unsigned char byte;
//#undef DEBUG
else {
/* Old data are not changed if realloc fails, capacity remains at old value */
#ifdef UL_DBUFF_LOGGING
else {
/* Old data are not changed if realloc fails, capacity remains at old value */
#ifdef UL_DBUFF_LOGGING
- vca_log("dbuff", LOG_DEB, "realloc buffer to %d failed\n", new_capacity);
+ ul_logdeb("realloc buffer to %d failed\n", new_capacity);
}
if(buf->len > buf->capacity) buf->len = buf->capacity;
#ifdef UL_DBUFF_LOGGING
}
if(buf->len > buf->capacity) buf->len = buf->capacity;
#ifdef UL_DBUFF_LOGGING
- vca_log("dbuff", LOG_DEB, "capacity changed from %d to %ld, required %d\n", old_capacity, buf->capacity, new_capacity);
+ ul_logdeb("capacity changed from %d to %ld, required %d\n", old_capacity, buf->capacity, new_capacity);
#endif
return buf->capacity;
}
#endif
return buf->capacity;
}
if(b == NULL) return 0;
if(new_len == ul_dbuff_set_len(buf, new_len)) {
memcpy(buf->data + old_len, b, n);
if(b == NULL) return 0;
if(new_len == ul_dbuff_set_len(buf, new_len)) {
memcpy(buf->data + old_len, b, n);
+ } else {
+ #ifdef UL_DBUFF_LOGGING
+ ul_logdeb("ul_dbuff_cat: set_len(%lu) error, old_len == %lu\n, act len == %lu\n", new_len, old_len, buf->len);
+ #endif
- #ifdef UL_DBUFF_LOGGING
- else {
- vca_log("dbuff", LOG_DEB, "ul_dbuff_cat: set_len(%lu) error, old_len == %lu\n, act len == %lu\n", new_len, old_len, buf->len);
- }
- #endif
{
/*
#ifdef UL_DBUFF_LOGGING
{
/*
#ifdef UL_DBUFF_LOGGING
- if(buf->len > 0) vca_log("dbuff", LOG_DEB, "ul_dbuff_strcat: '%s' + '%s'\n", buf->data, str);
- else vca_log("dbuff", LOG_DEB, "ul_dbuff_strcat: '' + %s\n", str);
+ if(buf->len > 0) ul_logdeb("ul_dbuff_strcat: '%s' + '%s'\n", buf->data, str);
+ else ul_logdeb("ul_dbuff_strcat: '' + %s\n", str);
#endif
*/
if(str == NULL) return 0;
if(buf->len > 0 && buf->data[buf->len-1] == '\0') {
/* #ifdef UL_DBUFF_LOGGING
#endif
*/
if(str == NULL) return 0;
if(buf->len > 0 && buf->data[buf->len-1] == '\0') {
/* #ifdef UL_DBUFF_LOGGING
- vca_log("dbuff", LOG_DEB, "ul_dbuff_strcat: terminating zero found at %ld, after '%c'\n", buf->len-1, buf->data[buf->len - 2]);
+ ul_logdeb("ul_dbuff_strcat: terminating zero found at %ld, after '%c'\n", buf->len-1, buf->data[buf->len - 2]);
#endif
*/
ul_dbuff_set_len(buf, buf->len - 1);
}
#ifdef UL_DBUFF_LOGGING
if(buf->len > 0 && buf->data[buf->len-1] != '\0') {
#endif
*/
ul_dbuff_set_len(buf, buf->len - 1);
}
#ifdef UL_DBUFF_LOGGING
if(buf->len > 0 && buf->data[buf->len-1] != '\0') {
- vca_log("dbuff", LOG_ERR, "ul_dbuff_strcat: terminating zero not found at %ld, found '%c'\n", buf->len-1, buf->data[buf->len-1]);
+ ul_logerr("ul_dbuff_strcat: terminating zero not found at %ld, found '%c'\n", buf->len-1, buf->data[buf->len-1]);
}
#endif
/* #ifdef UL_DBUFF_LOGGING
ul_dbuff_cat(buf, str, strlen(str) + 1);
}
#endif
/* #ifdef UL_DBUFF_LOGGING
ul_dbuff_cat(buf, str, strlen(str) + 1);
- vca_log("dbuff", LOG_DEB, "ul_dbuff_strcat: returning '%s'\n", buf->data);
+ ul_logdeb("ul_dbuff_strcat: returning '%s'\n", buf->data);
return buf->len;
#else
return ul_dbuff_cat(buf, str, strlen(str) + 1);
return buf->len;
#else
return ul_dbuff_cat(buf, str, strlen(str) + 1);