[prettyprint commit] r531 - Resolve 64-bit warnings and compile problems on Hardy.

[codesite...@google.com]

Author: thockin
Date: Mon Jun 8 16:32:40 2009
New Revision: 531

Modified:
trunk/examples/Makefile
trunk/examples/cmdline.c
trunk/examples/pp_fuse.cpp

Log:
Resolve 64-bit warnings and compile problems on Hardy.

Modified: trunk/examples/Makefile
==============================================================================
--- trunk/examples/Makefile (original)
+++ trunk/examples/Makefile Mon Jun 8 16:32:40 2009
@@ -10,10 +10,7 @@
BINS_SRCS = $(BINS:=.cpp)

pp_fuse_LDLIBS = -lfuse
-pp_fuse_LDLIBS_DYN = -lpthread
-ifeq ($(strip $(STATIC)),1)
- pp_fuse_LDLIBS += -ldl -lrt
-endif
+pp_fuse_LDLIBS_DYN = -lpthread -ldl -lrt

all: $(BINS)

Modified: trunk/examples/cmdline.c
==============================================================================
--- trunk/examples/cmdline.c (original)
+++ trunk/examples/cmdline.c Mon Jun 8 16:32:40 2009
@@ -181,10 +181,10 @@
opt = &opts[saved_index];
if (opt->type != CMDLINE_OPT_EOL) {
snprintf(buf, sizeof(buf), "-%-*s --%-*s%s%*s %s",
- maxlen1, opt->short_name ? opt->short_name : "",
- maxlen2, opt->long_name ? opt->long_name : "",
+ (int)maxlen1, opt->short_name ? opt->short_name : "",
+ (int)maxlen2, opt->long_name ? opt->long_name : "",
(maxlen3 > 0) ? " " : "",
- maxlen3, opt->arg_name ? opt->arg_name : "",
+ (int)maxlen3, opt->arg_name ? opt->arg_name : "",
opt->help);
saved_index++;
return buf;

Modified: trunk/examples/pp_fuse.cpp
==============================================================================
--- trunk/examples/pp_fuse.cpp (original)
+++ trunk/examples/pp_fuse.cpp Mon Jun 8 16:32:40 2009
@@ -172,7 +172,7 @@
static int
ppfs_readlink(const char *path, char *buf, size_t bufsize)
{
-printf("%d readlink: path = %s, size = %d\n", getpid(), path, bufsize);
+printf("%d readlink: path = %s, size = %zd\n", getpid(), path, bufsize);
const pp_dirent_const_ptr &de = platform->lookup_dirent(path);
if (!de) {
return -ENOENT;