about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorCristian Cadar <c.cadar@imperial.ac.uk>2015-04-02 17:53:21 +0100
committerCristian Cadar <c.cadar@imperial.ac.uk>2015-04-02 17:53:21 +0100
commit55488db3f978dce56ed45836bb72cba827e095b6 (patch)
tree4e30ae0aca4004b5ff032275bc5819c33573d1c2
parent8d7627bc4a7f86c361a843f5c9f2e95eb1b2b848 (diff)
downloadklee-55488db3f978dce56ed45836bb72cba827e095b6.tar.gz
Use C instead of C++ comments in C files to silence compiler warnings.
-rw-r--r--runtime/klee-libc/atexit.c4
-rw-r--r--runtime/klee-libc/calloc.c15
-rw-r--r--runtime/klee-libc/htonl.c6
-rw-r--r--runtime/klee-libc/memcpy.c4
-rw-r--r--runtime/klee-libc/memmove.c4
-rw-r--r--runtime/klee-libc/mempcpy.c4
-rw-r--r--runtime/klee-libc/putchar.c6
-rw-r--r--runtime/klee-libc/strchr.c4
-rw-r--r--runtime/klee-libc/strcmp.c4
-rw-r--r--runtime/klee-libc/strcoll.c6
-rw-r--r--runtime/klee-libc/strcpy.c4
-rw-r--r--runtime/klee-libc/strlen.c4
-rw-r--r--runtime/klee-libc/strrchr.c4
-rw-r--r--runtime/klee-libc/tolower.c4
-rw-r--r--runtime/klee-libc/toupper.c4
15 files changed, 39 insertions, 38 deletions
diff --git a/runtime/klee-libc/atexit.c b/runtime/klee-libc/atexit.c
index c71b2cd6..7b3b53b5 100644
--- a/runtime/klee-libc/atexit.c
+++ b/runtime/klee-libc/atexit.c
@@ -1,11 +1,11 @@
-//===-- atexit.c ----------------------------------------------------------===//
+/*==-- atexit.c ----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 int __cxa_atexit(void (*fn)(void*),
                  void *arg,
diff --git a/runtime/klee-libc/calloc.c b/runtime/klee-libc/calloc.c
index 30b88b30..1466fc07 100644
--- a/runtime/klee-libc/calloc.c
+++ b/runtime/klee-libc/calloc.c
@@ -1,16 +1,16 @@
-//===-- calloc.c ----------------------------------------------------------===//
+/*===-- calloc.c ----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <stdlib.h>
 #include <string.h>
 
-// DWD - I prefer to be internal
+/* DWD - I prefer to be internal */
 #if 0
 void *calloc(size_t nmemb, size_t size) {
 	unsigned nbytes = nmemb * size;
@@ -19,7 +19,8 @@ void *calloc(size_t nmemb, size_t size) {
 		memset(addr, 0, nbytes);
 	return addr;
 }
-// Always reallocate.
+
+/* Always reallocate. */
 void *realloc(void *ptr, size_t nbytes) {
 	if(!ptr)
 		return malloc(nbytes);
@@ -30,14 +31,14 @@ void *realloc(void *ptr, size_t nbytes) {
 	}
 
         unsigned copy_nbytes = klee_get_obj_size(ptr);
-	//printf("REALLOC: current object = %d bytes!\n", copy_nbytes);
+	/* printf("REALLOC: current object = %d bytes!\n", copy_nbytes); */
 
 	void *addr = malloc(nbytes);
 	if(addr) {
-		// shrinking
+	        /* shrinking */
 		if(copy_nbytes > nbytes)
 			copy_nbytes = nbytes;
-		//printf("REALLOC: copying = %d bytes!\n", copy_nbytes);
+		/* printf("REALLOC: copying = %d bytes!\n", copy_nbytes); */
 		memcpy(addr, ptr, copy_nbytes);
 		free(ptr);
 	} 
diff --git a/runtime/klee-libc/htonl.c b/runtime/klee-libc/htonl.c
index 521ef5d6..777ecf94 100644
--- a/runtime/klee-libc/htonl.c
+++ b/runtime/klee-libc/htonl.c
@@ -1,11 +1,11 @@
-//===-- htonl.c -----------------------------------------------------------===//
+/*===-- htonl.c -----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -16,7 +16,7 @@
 #undef ntohs
 #undef ntohl
 
-// Make sure we can recognize the endianness.
+/* Make sure we can recognize the endianness. */
 #if (!defined(BYTE_ORDER) || !defined(BIG_ENDIAN) || !defined(LITTLE_ENDIAN))
 #error "Unknown platform endianness!"
 #endif
diff --git a/runtime/klee-libc/memcpy.c b/runtime/klee-libc/memcpy.c
index 7f7f133d..c7c6e6d3 100644
--- a/runtime/klee-libc/memcpy.c
+++ b/runtime/klee-libc/memcpy.c
@@ -1,11 +1,11 @@
-//===-- memcpy.c ----------------------------------------------------------===//
+/*===-- memcpy.c ----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <stdlib.h>
 
diff --git a/runtime/klee-libc/memmove.c b/runtime/klee-libc/memmove.c
index c6e1ada9..3e86de02 100644
--- a/runtime/klee-libc/memmove.c
+++ b/runtime/klee-libc/memmove.c
@@ -1,11 +1,11 @@
-//===-- memmove.c ---------------------------------------------------------===//
+/*===-- memmove.c ---------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <stdlib.h>
 
diff --git a/runtime/klee-libc/mempcpy.c b/runtime/klee-libc/mempcpy.c
index 31e142d9..31712251 100644
--- a/runtime/klee-libc/mempcpy.c
+++ b/runtime/klee-libc/mempcpy.c
@@ -1,11 +1,11 @@
-//===-- mempcpy.c ---------------------------------------------------------===//
+/*===-- mempcpy.c ---------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <stdlib.h>
 
diff --git a/runtime/klee-libc/putchar.c b/runtime/klee-libc/putchar.c
index 497402a6..bee2d2d7 100644
--- a/runtime/klee-libc/putchar.c
+++ b/runtime/klee-libc/putchar.c
@@ -1,16 +1,16 @@
-//===-- putchar.c ---------------------------------------------------------===//
+/*===-- putchar.c ---------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <stdio.h>
 #include <unistd.h>
 
-// Some header may #define putchar.
+/* Some header may #define putchar. */
 #undef putchar
 
 int putchar(int c) {
diff --git a/runtime/klee-libc/strchr.c b/runtime/klee-libc/strchr.c
index 33f97bea..50f1b9f4 100644
--- a/runtime/klee-libc/strchr.c
+++ b/runtime/klee-libc/strchr.c
@@ -1,11 +1,11 @@
-//===-- strchr.c ----------------------------------------------------------===//
+/*===-- strchr.c ----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 char *strchr(const char *p, int ch) {
   char c;
diff --git a/runtime/klee-libc/strcmp.c b/runtime/klee-libc/strcmp.c
index 6b8c4e85..cdb002c7 100644
--- a/runtime/klee-libc/strcmp.c
+++ b/runtime/klee-libc/strcmp.c
@@ -1,11 +1,11 @@
-//===-- strcmp.c ----------------------------------------------------------===//
+/*===-- strcmp.c ----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 int strcmp(const char *a, const char *b) {
   while (*a && *a == *b)
diff --git a/runtime/klee-libc/strcoll.c b/runtime/klee-libc/strcoll.c
index 73d59f89..8f78b0b3 100644
--- a/runtime/klee-libc/strcoll.c
+++ b/runtime/klee-libc/strcoll.c
@@ -1,15 +1,15 @@
-//===-- strcoll.c ---------------------------------------------------------===//
+/*===-- strcoll.c ---------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <string.h>
 
-// according to the manpage, this is equiv in the POSIX/C locale.
+/* according to the manpage, this is equiv in the POSIX/C locale. */
 int strcoll(const char *s1, const char *s2) {
   return strcmp(s1,s2);
 }
diff --git a/runtime/klee-libc/strcpy.c b/runtime/klee-libc/strcpy.c
index 0fbaf9a7..d1ec67b8 100644
--- a/runtime/klee-libc/strcpy.c
+++ b/runtime/klee-libc/strcpy.c
@@ -1,11 +1,11 @@
-//===-- strcpy.c ----------------------------------------------------------===//
+/*===-- strcpy.c ----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 char *strcpy(char *to, const char *from) {
   char *start = to;
diff --git a/runtime/klee-libc/strlen.c b/runtime/klee-libc/strlen.c
index e298410c..33846134 100644
--- a/runtime/klee-libc/strlen.c
+++ b/runtime/klee-libc/strlen.c
@@ -1,11 +1,11 @@
-//===-- strlen.c ----------------------------------------------------------===//
+/*===-- strlen.c ----------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <string.h>
 
diff --git a/runtime/klee-libc/strrchr.c b/runtime/klee-libc/strrchr.c
index 01128b48..4d51769b 100644
--- a/runtime/klee-libc/strrchr.c
+++ b/runtime/klee-libc/strrchr.c
@@ -1,11 +1,11 @@
-//===-- strrchr.c ---------------------------------------------------------===//
+/*===-- strrchr.c ---------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 #include <string.h>
 
diff --git a/runtime/klee-libc/tolower.c b/runtime/klee-libc/tolower.c
index 265f5deb..a311f2010 100644
--- a/runtime/klee-libc/tolower.c
+++ b/runtime/klee-libc/tolower.c
@@ -1,11 +1,11 @@
-//===-- tolower.c ---------------------------------------------------------===//
+/*===-- tolower.c ---------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 int tolower(int ch) {
   if ( (unsigned int)(ch - 'A') < 26u )
diff --git a/runtime/klee-libc/toupper.c b/runtime/klee-libc/toupper.c
index 37e5f9d6..5030b5cc 100644
--- a/runtime/klee-libc/toupper.c
+++ b/runtime/klee-libc/toupper.c
@@ -1,11 +1,11 @@
-//===-- toupper.c ---------------------------------------------------------===//
+/*===-- toupper.c ---------------------------------------------------------===//
 //
 //                     The KLEE Symbolic Virtual Machine
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
 
 int toupper(int ch) {
   if ( (unsigned int)(ch - 'a') < 26u )