summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMarkus Mittendrein <git@maxmitti.tk>2019-03-08 00:22:20 +0100
committerMarkus Mittendrein <git@maxmitti.tk>2019-03-08 00:25:57 +0100
commit31693290ed717d700480774f4f6b49dbe9b9b704 (patch)
tree4cbbeb7ea82a950ea3c9ebadea6276d750482c4b /examples
parent841ee0e92516827e6dd6f2101903b5ec1cc85fb4 (diff)
downloadcc4group-31693290ed717d700480774f4f6b49dbe9b9b704.tar.gz
cc4group-31693290ed717d700480774f4f6b49dbe9b9b704.zip
Windows support (hopefully!)
Diffstat (limited to 'examples')
-rw-r--r--examples/c4cat.c7
-rw-r--r--examples/c4ls.c8
2 files changed, 8 insertions, 7 deletions
diff --git a/examples/c4cat.c b/examples/c4cat.c
index 04f51b6..3da506e 100644
--- a/examples/c4cat.c
+++ b/examples/c4cat.c
@@ -3,11 +3,11 @@
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
-#include <sys/mman.h>
#include <fcntl.h>
#include <unistd.h>
#include "cc4group.h"
+#include "platform/platform.h"
bool catNormalFile(const char* const path, const off_t size)
{
@@ -18,7 +18,8 @@ bool catNormalFile(const char* const path, const off_t size)
return false;
}
- void* mappedFile = mmap(NULL, size, PROT_READ, MAP_PRIVATE, file, 0);
+ void* extra;
+ void* mappedFile = cc4group_mmap(NULL, size, PROT_READ, MAP_PRIVATE, file, 0, &extra);
if(close(file) == -1)
{
@@ -36,7 +37,7 @@ bool catNormalFile(const char* const path, const off_t size)
fprintf(stderr, "ERROR: Writing file contents of \"%s\" to stdout: %s\n", path, strerror(errno));
}
- if(munmap(mappedFile, size) == -1)
+ if(cc4group_munmap(mappedFile, size, extra) == -1)
{
fprintf(stderr, "ERROR: Unmapping \"%s\": %s\n", path, strerror(errno));
}
diff --git a/examples/c4ls.c b/examples/c4ls.c
index 4324d9b..ce2f996 100644
--- a/examples/c4ls.c
+++ b/examples/c4ls.c
@@ -13,19 +13,19 @@ const char* formatTime(int32_t time)
return ret;
}
-const char* formatSize(size_t size)
+const char* formatSize(uint32_t size)
{
static char ret[128];
if(size < 1000)
{
- snprintf(ret, 128, "%4zd", size);
+ snprintf(ret, 128, "%4ud", size);
return ret;
}
static const char prefixes[] = " KMGTPE";
const char* prefix = prefixes;
- size_t fract = 0;
+ uint32_t fract = 0;
while(size >= 1000 && *(prefix + 1) != '\0')
{
@@ -40,7 +40,7 @@ const char* formatSize(size_t size)
}
else
{
- snprintf(ret, 128, "%3zd%c", size, *prefix);
+ snprintf(ret, 128, "%3u%c", size, *prefix);
}
return ret;