[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit c0afc51729c2be4a98cff5e72ae2744235c1af87
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Jan 27 12:07:08 2010 +0200

    Don't use C++ comments in C code.

diff --git a/clamd/session.c b/clamd/session.c
index 009637c..4dbad16 100644
--- a/clamd/session.c
+++ b/clamd/session.c
@@ -233,9 +233,9 @@ int command(client_conn_t *conn, int *virus)
 	    }
 	    pthread_mutex_unlock(&conn->thrpool->pool_mutex);
 	    if (ret) {
-		// multiscan has 1 control thread, so there needs to be at least
-		// 1 threads that is a non-multiscan controlthread to scan and
-		// make progress.
+		/* multiscan has 1 control thread, so there needs to be at least
+		   1 threads that is a non-multiscan controlthread to scan and
+		   make progress. */
 		logg("^Not enough threads for multiscan. Max: %d, Alive: %d, Multiscan: %d+1\n",
 		     max, alive, multiscan);
 		conn_reply(conn, conn->filename, "Not enough threads for multiscan. Increase MaxThreads.", "ERROR");
diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c
index b23af21..adf2358 100644
--- a/libclamav/bytecode.c
+++ b/libclamav/bytecode.c
@@ -111,7 +111,7 @@ static int cli_bytecode_context_reset(struct cli_bc_ctx *ctx)
 	ctx->mpool = NULL;
     }
 #else
-    //TODO: implement for no-mmap case too
+    /*TODO: implement for no-mmap case too*/
 #endif
     return CL_SUCCESS;
 }
@@ -437,7 +437,7 @@ static int parseHeader(struct cli_bc *bc, unsigned char *buffer, unsigned *linel
 	cli_dbgmsg("Skipping bytecode with functionality level: %u\n", flevel);
 	return CL_BREAK;
     }
-    // Optimistic parsing, check for error only at the end.
+    /* Optimistic parsing, check for error only at the end.*/
     bc->metadata.timestamp = readNumber(buffer, &offset, len, &ok);
     bc->metadata.sigmaker = readString(buffer, &offset, len, &ok);
     bc->metadata.targetExclude = readNumber(buffer, &offset, len, &ok);
@@ -1321,7 +1321,7 @@ int cli_bytecode_load(struct cli_bc *bc, FILE *f, struct cli_dbio *dbio, int tru
 		    }
 		    break;
 		}
-		// fall-through
+		/* fall-through */
 	    case PARSE_FUNC_HEADER:
 		rc = parseFunctionHeader(bc, current_func, (unsigned char*)buffer);
 		if (rc != CL_SUCCESS) {
@@ -1399,7 +1399,6 @@ int cli_bytecode_run(const struct cli_all_bc *bcs, const struct cli_bc *bc, stru
 uint64_t cli_bytecode_context_getresult_int(struct cli_bc_ctx *ctx)
 {
     return *(uint32_t*)ctx->values;/*XXX*/
-//    return ctx->values[ctx->numParams];
 }
 
 void cli_bytecode_destroy(struct cli_bc *bc)
@@ -1571,7 +1570,7 @@ static int cli_bytecode_prepare_interpreter(struct cli_bc *bc)
 		    break;
 		case OP_BC_GEP1:
 		case OP_BC_GEPZ:
-		    //three[0] is the type
+		    /*three[0] is the type*/
 		    MAP(inst->u.three[1]);
 		    MAP(inst->u.three[2]);
 		    break;
@@ -1762,8 +1761,8 @@ void cli_bytecode_describe(const struct cli_bc *bc)
     printf("\tcompiled on: %s",
 	   cli_ctime(&stamp, buf, sizeof(buf)));
     printf("\tcompiled by: %s\n", bc->metadata.sigmaker ? bc->metadata.sigmaker : "N/A");
-    //TODO: parse and display arch name, also take it into account when
-    //JITing!
+    /*TODO: parse and display arch name, also take it into account when
+      JITing*/
     printf("\ttarget exclude: %d\n", bc->metadata.targetExclude);
     printf("\tbytecode type: ");
     switch (bc->kind) {
diff --git a/libclamav/bytecode_nojit.c b/libclamav/bytecode_nojit.c
index 7f5a8f2..93597d2 100644
--- a/libclamav/bytecode_nojit.c
+++ b/libclamav/bytecode_nojit.c
@@ -59,7 +59,7 @@ int cli_bytecode_done_jit(struct cli_all_bc *allbc)
 }
 
 void cli_bytecode_debug(int argc, char **argv) {
-  // Empty
+  /* Empty */
 }
 
 int bytecode_init(void)
@@ -68,7 +68,7 @@ int bytecode_init(void)
 }
 
 void cli_bytecode_debug_printsrc(const struct cli_bc_ctx *ctx) {
-    // Empty
+    /* Empty */
 }
 void cli_bytecode_printversion(void) {
   printf("LLVM not compiled in\n");
diff --git a/unit_tests/check_bytecode.c b/unit_tests/check_bytecode.c
index 09acda0..9dfeb9d 100644
--- a/unit_tests/check_bytecode.c
+++ b/unit_tests/check_bytecode.c
@@ -118,7 +118,7 @@ START_TEST (test_apicalls2)
     cl_init(CL_INIT_DEFAULT);
     if (have_clamjit)/*FIXME: should work with both */
     runtest("input/apicalls2.cbc", 0xf00d, CL_SUCCESS, 0);
-//    runtest("input/apicalls2.cbc", 0xf00d, CL_SUCCESS, 1);
+/*    runtest("input/apicalls2.cbc", 0xf00d, CL_SUCCESS, 1); */
 }
 END_TEST
 

-- 
Debian repository for ClamAV