Apple-2-Tools/profuse
1
0
Fork 0
mirror of https://github.com/ksherlock/profuse.git synced 2025-08-16 11:27:18 +00:00
Code Issues Projects Releases Wiki Activity

clean up pedantic errors.

Browse Source 
git-svn-id: https://profuse.googlecode.com/svn/trunk@56 aa027e90-d47c-11dd-86d7-074df07e0730
This commit is contained in:
ksherlock
2009-09-04 20:23:20 +00:00
parent 592b56c8a5
commit 00b6063040
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
xattr.cpp
View File

@@ -12,6 +12,7 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
typedef std::vector<std::string>::iterator vsiter;
#ifdef __APPLE__ #ifdef __APPLE__
// apple has additional parameter for position and options. // apple has additional parameter for position and options.
@@ -44,7 +45,7 @@ const char *HexMap = "0123456789abcdef";
std::memset(buffer1, ' ', sizeof(buffer1)); std::memset(buffer1, ' ', sizeof(buffer1));
std::memset(buffer2, ' ', sizeof(buffer2)); std::memset(buffer2, ' ', sizeof(buffer2));
ssize_t linelen = std::min(size, (ssize_t)16); unsigned linelen = std::min((unsigned)size, (unsigned)16);
for (i = 0, j = 0; i < linelen; i++) for (i = 0, j = 0; i < linelen; i++)
@@ -55,7 +56,8 @@ const char *HexMap = "0123456789abcdef";
j++; j++;
if (i == 7) j++; if (i == 7) j++;
buffer2[i] = std::isprint(x) ? x : '.'; // isascii not part of std:: and may be a macro.
buffer2[i] = isascii(x) && std::isprint(x) ? x : '.';
} }
@@ -63,7 +65,7 @@ const char *HexMap = "0123456789abcdef";
buffer2[sizeof(buffer2)-1] = 0; buffer2[sizeof(buffer2)-1] = 0;
std::printf("%06x:\t%s\t%s\n", offset, buffer1, buffer2); std::printf("%06x:\t%s\t%s\n", (unsigned)offset, buffer1, buffer2);
offset += 16; offset += 16;
data += 16; data += 16;
size -= 16; size -= 16;
@@ -132,7 +134,7 @@ char *buffer;
return; return;
} }
std::printf("%s: %d\n", attr, asize); std::printf("%s: %u\n", attr, (unsigned)asize);
buffer = new char[asize]; buffer = new char[asize];
//if (!buffer) return; //if (!buffer) return;
@@ -175,24 +177,23 @@ int list(int argc, char **argv)
} }
} }
typedef std::vector<std::string>::iterator iter;
// find the max name length (not utf-8 happy) // find the max name length (not utf-8 happy)
ssize_t maxname = 0; unsigned maxname = 0;
for (iter i = attr.begin(); i != attr.end() ; ++i) for (vsiter i = attr.begin(); i != attr.end() ; ++i)
{ {
maxname = std::max(maxname, (ssize_t)i->length()); maxname = std::max(maxname, (unsigned)i->length());
} }
maxname += 2; maxname += 2;
for (iter i = attr.begin(); i != attr.end() ; ++i) for (vsiter i = attr.begin(); i != attr.end() ; ++i)
{ {
const char *attr_name = i->c_str(); const char *attr_name = i->c_str();
ssize_t asize = getxattr(fname, attr_name, NULL, 0); ssize_t asize = getxattr(fname, attr_name, NULL, 0);
if (asize >= 0) if (asize >= 0)
{ {
std::printf("%-*s % 8u\n", maxname, attr_name, asize); std::printf("%-*s %8u\n", maxname, attr_name, (unsigned)asize);
} }
else else
{ {
@@ -229,9 +230,9 @@ int dump(int argc, char **argv)
} }
for (int i = 0; i < attr.size(); ++i) for (vsiter i = attr.begin(); i != attr.end() ; ++i)
{ {
const char *attr_name = attr[i].c_str(); const char *attr_name = i->c_str();
dumpxattr(fname, attr_name); dumpxattr(fname, attr_name);
} }