32 lines
1.2 KiB
Text
32 lines
1.2 KiB
Text
$NetBSD: patch-ag,v 1.3 2008/08/02 17:10:13 dholland Exp $
|
|
|
|
--- src/testing/test_libdar.cpp~ 2007-07-22 12:35:01.000000000 -0400
|
|
+++ src/testing/test_libdar.cpp 2008-08-02 13:01:08.000000000 -0400
|
|
@@ -89,7 +89,7 @@ void f1()
|
|
|
|
void warning(const string &x, void *context)
|
|
{
|
|
- printf("[%d]%s\n", (U_I)context, x.c_str());
|
|
+ printf("[%p]%s\n", context, x.c_str());
|
|
}
|
|
|
|
bool question(const string & x, void *context)
|
|
@@ -97,7 +97,7 @@ bool question(const string & x, void *co
|
|
bool rep = false;
|
|
char r;
|
|
|
|
- printf("[%d]%s\n", (U_I)context, x.c_str());
|
|
+ printf("[%p]%s\n", context, x.c_str());
|
|
scanf("%c", &r);
|
|
rep = r == 'y';
|
|
|
|
@@ -120,7 +120,8 @@ void listing(const std::string & flag,
|
|
bool has_children,
|
|
void *context)
|
|
{
|
|
- ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
|
|
+ /* note: ui.printf isn't printf and can't do %p */
|
|
+ ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)(uintptr_t)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
|
|
}
|
|
|
|
void f2()
|