Replace more C99/C++ comments with oldschool /* */ comments

diff --git a/buffer.c b/buffer.c
index 2d399d7ca0bb3a711e303547dbab0381a90b20ed..36a88fa54c6069b3deb7f8d791b23b023834dc5b 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -188,19 +188,19 @@ evbuffer_chain_free(struct evbuffer_chain *chain)
 {
        EVUTIL_ASSERT(chain->refcnt > 0);
        if (--chain->refcnt > 0) {
-               // chain is still referenced by other chains
+               /* chain is still referenced by other chains */
                return;
        }
 
        if (CHAIN_PINNED(chain)) {
-               // will get freed once no longer dangling
+               /* will get freed once no longer dangling */
                chain->refcnt++;
                chain->flags |= EVBUFFER_DANGLING;
                return;
        }
 
-       // safe to release chain, it's either a referencing
-       // chain or all references to it have been freed
+       /* safe to release chain, it's either a referencing
+        * chain or all references to it have been freed */
        if (chain->flags & EVBUFFER_REFERENCE) {
                struct evbuffer_chain_reference *info =
                    EVBUFFER_CHAIN_EXTRA(
@@ -229,10 +229,10 @@ evbuffer_chain_free(struct evbuffer_chain *chain)
                    EVBUFFER_CHAIN_EXTRA(
                            struct evbuffer_multicast_parent,
                            chain);
-               // referencing chain is being freed, decrease
-               // refcounts of source chain and associated
-               // evbuffer (which get freed once both reach
-               // zero)
+               /* referencing chain is being freed, decrease
+                * refcounts of source chain and associated
+                * evbuffer (which get freed once both reach
+                * zero) */
                EVUTIL_ASSERT(info->source != NULL);
                EVUTIL_ASSERT(info->parent != NULL);
                EVBUFFER_LOCK(info->source);
@@ -898,7 +898,7 @@ APPEND_CHAIN_MULTICAST(struct evbuffer *dst, struct evbuffer *src)
 
        for (; chain; chain = chain->next) {
                if (!chain->off || chain->flags & EVBUFFER_DANGLING) {
-                       // skip empty chains
+                       /* skip empty chains */
                        continue;
                }
 
@@ -908,12 +908,12 @@ APPEND_CHAIN_MULTICAST(struct evbuffer *dst, struct evbuffer *src)
                        return;
                }
                extra = EVBUFFER_CHAIN_EXTRA(struct evbuffer_multicast_parent, tmp);
-               // reference evbuffer containing source chain so it
-               // doesn't get released while the chain is still
-               // being referenced to
+               /* reference evbuffer containing source chain so it
+                * doesn't get released while the chain is still
+                * being referenced to */
                _evbuffer_incref(src);
                extra->source = src;
-               // reference source chain which now becomes immutable
+               /* reference source chain which now becomes immutable */
                evbuffer_chain_incref(chain);
                extra->parent = chain;
                chain->flags |= EVBUFFER_IMMUTABLE;
@@ -1012,7 +1012,7 @@ evbuffer_add_buffer_reference(struct evbuffer *outbuf, struct evbuffer *inbuf)
 
        for (; chain; chain = chain->next) {
                if ((chain->flags & (EVBUFFER_FILESEGMENT|EVBUFFER_SENDFILE|EVBUFFER_MULTICAST)) != 0) {
-                       // chain type can not be referenced
+                       /* chain type can not be referenced */
                        result = -1;
                        goto done;
                }

diff --git a/evport.c b/evport.c
index f7f5597466be127cae57f8d99aa258c53ce38632..50f065a65c5772f396cc8d95f6124e8fdcf9bd1b 100644 (file)
--- a/evport.c
+++ b/evport.c
@@ -291,7 +291,7 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
 
                if (fdi != NULL && FDI_HAS_EVENTS(fdi)) {
                        reassociate(epdp, fdi, fd);
-//                     epdp->ed_pending[i] = -1;
+                       /* epdp->ed_pending[i] = -1; */
                        fdi->pending_idx_plus_1 = 0;
                }
        }
@@ -321,7 +321,7 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
                port_event_t *pevt = &pevtlist[i];
                int fd = (int) pevt->portev_object;
                struct fd_info *fdi = pevt->portev_user;
-               //EVUTIL_ASSERT(evmap_io_get_fdinfo(&base->io, fd) == fdi);
+               /*EVUTIL_ASSERT(evmap_io_get_fdinfo(&base->io, fd) == fdi);*/
 
                check_evportop(epdp);
                check_event(pevt);

diff --git a/test/regress_buffer.c b/test/regress_buffer.c
index 6348a2354519b6739e5402d2ba0f9c1e0b07d1e6..5981e9be1b63b1dc2f63a9f25a07d35ea194358d 100644 (file)
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@@ -1619,11 +1619,11 @@ test_evbuffer_multicast(void *ptr)
        tt_assert(buf2);
 
        tt_int_op(evbuffer_add_buffer_reference(buf2, buf1), ==, 0);
-       // nested references are not allowed
+       /* nested references are not allowed */
        tt_int_op(evbuffer_add_buffer_reference(buf2, buf2), ==, -1);
        tt_int_op(evbuffer_add_buffer_reference(buf1, buf2), ==, -1);
 
-       // both buffers contain the same amount of data
+       /* both buffers contain the same amount of data */
        tt_int_op(evbuffer_get_length(buf1), ==, evbuffer_get_length(buf1));
 
        /* Make sure we can drain a little from the first buffer. */