Add "name" argument to klee_make_symbolic, and kill off klee_make_symbolic_name.

 - For compatibility we still accept 2 argument form of klee_make_symbolic, but
   this will go away eventually.


git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@72265 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 12 insertions, 12 deletions

diff --git a/test/Feature/AliasFunction.c b/test/Feature/AliasFunction.c
index e7acfc19..16d89ef6 100644
--- a/test/Feature/AliasFunction.c
+++ b/test/Feature/AliasFunction.c
@@ -11,7 +11,7 @@ void bar() { printf("  bar()\n"); }
 
 int main() {
   int x;
-  klee_make_symbolic_name(&x, sizeof(x), "x");
+  klee_make_symbolic(&x, sizeof(x), "x");
 
   // no aliases
   foo();
diff --git a/test/Feature/AliasFunctionExit.c b/test/Feature/AliasFunctionExit.c
index fcaf7e6c..4bda950a 100644
--- a/test/Feature/AliasFunctionExit.c
+++ b/test/Feature/AliasFunctionExit.c
@@ -22,7 +22,7 @@ void end(int status) {
 
 int main() {
   int x;
-  klee_make_symbolic_name(&x, sizeof(x), "x");
+  klee_make_symbolic(&x, sizeof(x), "x");
 
   klee_alias_function("exit", "end");
   start(x);
diff --git a/test/Feature/MakeSymbolicName.c b/test/Feature/MakeSymbolicName.c
index c1f11424..a4d4e2a6 100644
--- a/test/Feature/MakeSymbolicName.c
+++ b/test/Feature/MakeSymbolicName.c
@@ -7,7 +7,7 @@ int main() {
   int a[4] = {1, 2, 3, 4};
   unsigned i;
 
-  klee_make_symbolic_name(&i, sizeof(i), "index");  
+  klee_make_symbolic(&i, sizeof(i), "index");  
   if (i > 3)
     klee_silent_exit(0);
 
diff --git a/test/Feature/NamedSeedMatching.c b/test/Feature/NamedSeedMatching.c
index 6d52e7a4..cff34282 100644
--- a/test/Feature/NamedSeedMatching.c
+++ b/test/Feature/NamedSeedMatching.c
@@ -16,20 +16,20 @@ int main(int argc, char **argv) {
   int a, b, c, x;
 
   if (argc==2 && strcmp(argv[1], "initial") == 0) {
-    klee_make_symbolic_name(&a, sizeof a, "a");
-    klee_make_symbolic_name(&b, sizeof b, "b");
-    klee_make_symbolic_name(&c, sizeof c, "c");
-    klee_make_symbolic_name(&x, sizeof x, "a");
+    klee_make_symbolic(&a, sizeof a, "a");
+    klee_make_symbolic(&b, sizeof b, "b");
+    klee_make_symbolic(&c, sizeof c, "c");
+    klee_make_symbolic(&x, sizeof x, "a");
 
     klee_assume(a == 3);
     klee_assume(b == 4);
     klee_assume(c == 5);
     klee_assume(x == 6);
   } else {
-    klee_make_symbolic_name(&a, sizeof a, "a");
-    klee_make_symbolic_name(&c, sizeof c, "c");
-    klee_make_symbolic_name(&b, sizeof b, "b");
-    klee_make_symbolic_name(&x, sizeof x, "a");
+    klee_make_symbolic(&a, sizeof a, "a");
+    klee_make_symbolic(&c, sizeof c, "c");
+    klee_make_symbolic(&b, sizeof b, "b");
+    klee_make_symbolic(&x, sizeof x, "a");
   }
 
   if (a==3) printf("a==3\n");
diff --git a/test/Feature/const_array_opt1.c b/test/Feature/const_array_opt1.c
index 96c46fb9..09ed07fd 100644
--- a/test/Feature/const_array_opt1.c
+++ b/test/Feature/const_array_opt1.c
@@ -20,7 +20,7 @@ int main() {
   for (i=0; i<N; i++)
     a[i] = i % 256;
   
-  klee_make_symbolic_name(k, sizeof(k), "k");
+  klee_make_symbolic(k, sizeof(k), "k");
   
   for (i=0; i<N_IDX; i++) {
     if (k[i] >= N)