Fix more bad string/printf usage

dlang · Apr 28, 2011 · ad12117 · ad12117
1 parent 43b6209
commit ad12117
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/test/runnable/imports/test40a.d b/test/runnable/imports/test40a.d
@@ -7,7 +7,8 @@ template Mix()
     static void foobar()
     {
 	auto context = new Context;
-	printf("context: %.*s %p\n", context.toString, context);
+        auto ts = context.toString;
+	printf("context: %.*s %p\n", ts.length, ts.ptr, context);
 	context.func!(typeof(this))();
 	printf(`returning from opCall`\n);
     }
@@ -23,7 +24,7 @@ class Bar
 void someFunc(string z)
 {
     printf(`str length: %d`\n, z.length);
-    printf(`str: '%.*s'`\n, z);
+    printf(`str: '%.*s'`\n, z.length, z.ptr);
 }
 
 

diff --git a/test/runnable/interface2.d b/test/runnable/interface2.d
@@ -27,7 +27,7 @@ void test1()
     printf("f = %p\n", f);
     assert(cast(void*)b !is cast(void*)f);
 
-    printf("f.class = '%.*s'\n", f.classinfo.name);
+    printf("f.class = '%.*s'\n", f.classinfo.name.length, f.classinfo.name.ptr);
     assert(f.classinfo.name == "interface2.Foo");
 
     f.bar();

diff --git a/test/runnable/interpret.d b/test/runnable/interpret.d
@@ -1781,7 +1781,7 @@ string foo90(string a, string b)
 void test90()
 {
     static const string xxx = foo90("A", "xxx");
-    printf("%.*s\n", xxx);
+    printf("%.*s\n", xxx.length, xxx.ptr);
     assert(xxx == "A");
 }
 

diff --git a/test/runnable/opover.d b/test/runnable/opover.d
@@ -836,7 +836,7 @@ class A13
  A13 opShl(string x)
  {
     printf("A::opShl(char[])\n");
-    printf("%.*s",x);
+    printf("%.*s", x.length, x.ptr);
     return this;
  }
 }

diff --git a/test/runnable/test19.d b/test/runnable/test19.d
@@ -168,14 +168,14 @@ void test7()
 printf("test7.1()\n");
     ob.data[] = '-';
 printf("test7.2()\n");
-    printf("ob.data[] = '%.*s'\n", ob.data);
+    printf("ob.data[] = '%.*s'\n", ob.data.length, ob.data.ptr);
     for (i = 0; i < 10; i++)
 	assert(ob.data[i] == '-');
 
     ob.offset = 3;
     ob.write("foo", 3);
     printf("ob.data.length = %d\n", ob.data.length);
-    printf("ob.data[] = '%.*s'\n", ob.data);
+    printf("ob.data[] = '%.*s'\n", ob.data.length, ob.data.ptr);
     for (i = 0; i < 10; i++)
     {	if (i < 3 || i >= 6)
 	    assert(ob.data[i] == '-');