Merge remote-tracking branch 'origin/master' into 64bithash

jmacd · jmacd · commit 566b1a968889 · 2016-01-07T22:49:10.000-08:00
diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
@@ -316,7 +316,7 @@ class ExtFile {
     pid_t pid = getpid();
     char buf[64];
     xoff_t xpid = pid;
-    snprintf(buf, 64, "/tmp/regtest.%"Q"u.%d", xpid, static_counter++);
+    snprintf(buf, 64, "/tmp/regtest.%" Q "u.%d", xpid, static_counter++);
     filename_.append(buf);
     unlink(filename_.c_str());
   }

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ class ExtFile {`
`316`	`316`	`pid_t pid = getpid();`
`317`	`317`	`char buf[64];`
`318`	`318`	`xoff_t xpid = pid;`
`319`		`- snprintf(buf, 64, "/tmp/regtest.%"Q"u.%d", xpid, static_counter++);`
	`319`	`+ snprintf(buf, 64, "/tmp/regtest.%" Q "u.%d", xpid, static_counter++);`
`320`	`320`	`filename_.append(buf);`
`321`	`321`	`unlink(filename_.c_str());`
`322`	`322`	`}`