summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2015-05-28 17:06:18 +0100
committerVincent Sanders <vince@kyllikki.org>2015-05-28 17:06:18 +0100
commit0d811963c1498aa625b5438bf66dbb677a0d4494 (patch)
tree470d44bdf1986a9e77a5bc5f2d71fe6d8bf7827f /utils
parent30c2962faa0c31d70b91993ccd9c2f3f8f298810 (diff)
downloadnetsurf-0d811963c1498aa625b5438bf66dbb677a0d4494.tar.gz
netsurf-0d811963c1498aa625b5438bf66dbb677a0d4494.tar.bz2
fixup all the remaining logging macro callsites
The semantic patch tool appears to have missed some difficult to reason about callsites which have now been manually cleaned up
Diffstat (limited to 'utils')
-rw-r--r--utils/container.c4
-rw-r--r--utils/ring.h14
2 files changed, 9 insertions, 9 deletions
diff --git a/utils/container.c b/utils/container.c
index 5946d12f9..68ea32211 100644
--- a/utils/container.c
+++ b/utils/container.c
@@ -208,7 +208,7 @@ static void container_process(struct container_ctx *ctx)
/* now work through the directory structure taking it apart into
* our structure */
#define BEREAD(x) do { val = fread(&(x), 4, 1, ctx->fh); if (val == 0)\
- LOG(("empty read"));(x) = ntohl((x)); } while (0)
+ LOG("empty read");(x) = ntohl((x)); } while (0)
do {
val = fread(filename, 64, 1, ctx->fh);
if (val == 0)
@@ -295,7 +295,7 @@ static void container_write_dir(struct container_ctx *ctx)
unsigned int i;
u_int32_t tmp;
#define BEWRITE(x) do {tmp = htonl((x)); val = fwrite(&tmp, 4, 1, ctx->fh);\
- if (val == 0) LOG(("empty write")); } while(0)
+ if (val == 0) LOG("empty write"); } while(0)
for (i = 1; i <= ctx->entries; i++) {
struct container_dirent *e = ctx->directory + i - 1;
val = fwrite(e->filename, 64, 1, ctx->fh);
diff --git a/utils/ring.h b/utils/ring.h
index 42fd676eb..1802b4484 100644
--- a/utils/ring.h
+++ b/utils/ring.h
@@ -38,7 +38,7 @@
* Assumes that the element is zeroed as appropriate.
*/
#define RING_INSERT(ring,element) \
- /*LOG(("RING_INSERT(%s, %p(%s))", #ring, element, element->host));*/ \
+ /*LOG("RING_INSERT(%s, %p(%s))", #ring, element, element->host);*/ \
if (ring) { \
element->r_next = ring; \
element->r_prev = ring->r_prev; \
@@ -51,7 +51,7 @@
* Will zero the element as needed
*/
#define RING_REMOVE(ring, element) \
- /*LOG(("RING_REMOVE(%s, %p(%s)", #ring, element, element->host));*/ \
+ /*LOG("RING_REMOVE(%s, %p(%s)", #ring, element, element->host);*/ \
if (element->r_next != element ) { \
/* Not the only thing in the ring */ \
element->r_next->r_prev = element->r_prev; \
@@ -67,7 +67,7 @@
* provided element variable
*/
#define RING_FINDBYHOST(ring, element, hostname) \
- /*LOG(("RING_FINDBYHOST(%s, %s)", #ring, hostname));*/ \
+ /*LOG("RING_FINDBYHOST(%s, %s)", #ring, hostname);*/ \
if (ring) { \
bool found = false; \
element = ring; \
@@ -85,7 +85,7 @@
* provided element variable
*/
#define RING_FINDBYLWCHOST(ring, element, lwc_hostname) \
- /*LOG(("RING_FINDBYHOST(%s, %s)", #ring, hostname));*/ \
+ /*LOG("RING_FINDBYHOST(%s, %s)", #ring, hostname);*/ \
if (ring) { \
bool found = false; \
element = ring; \
@@ -102,7 +102,7 @@
/** Measure the size of a ring and put it in the supplied variable */
#define RING_GETSIZE(ringtype, ring, sizevar) \
- /*LOG(("RING_GETSIZE(%s)", #ring));*/ \
+ /*LOG("RING_GETSIZE(%s)", #ring);*/ \
if (ring) { \
ringtype *p = ring; \
sizevar = 0; \
@@ -114,7 +114,7 @@
/** Count the number of elements in the ring which match the provided hostname */
#define RING_COUNTBYHOST(ringtype, ring, sizevar, hostname) \
- /*LOG(("RING_COUNTBYHOST(%s, %s)", #ring, hostname));*/ \
+ /*LOG("RING_COUNTBYHOST(%s, %s)", #ring, hostname);*/ \
if (ring) { \
ringtype *p = ring; \
sizevar = 0; \
@@ -127,7 +127,7 @@
/** Count the number of elements in the ring which match the provided lwc_hostname */
#define RING_COUNTBYLWCHOST(ringtype, ring, sizevar, lwc_hostname) \
- /*LOG(("RING_COUNTBYHOST(%s, %s)", #ring, hostname));*/ \
+ /*LOG("RING_COUNTBYHOST(%s, %s)", #ring, hostname);*/ \
if (ring) { \
ringtype *p = ring; \
sizevar = 0; \