X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/d532c4d1612c94347427fa1afda6afb7c34e512a..bafab423f20bc1448b293842c235965e1681f07e:/cache.c?ds=sidebyside

diff --git a/cache.c b/cache.c
index 57068a1..3127fc2 100644
--- a/cache.c
+++ b/cache.c
@@ -105,7 +105,7 @@ static int is_expired(struct cache_slot *slot)
 	if (slot->ttl < 0)
 		return 0;
 	else
-		return slot->cache_st.st_mtime + slot->ttl*60 < time(NULL);
+		return slot->cache_st.st_mtime + slot->ttl * 60 < time(NULL);
 }
 
 /* Check if the slot has been modified since we opened it.
@@ -141,8 +141,8 @@ static int close_lock(struct cache_slot *slot)
  */
 static int lock_slot(struct cache_slot *slot)
 {
-	slot->lock_fd = open(slot->lock_name, O_RDWR|O_CREAT|O_EXCL,
-			     S_IRUSR|S_IWUSR);
+	slot->lock_fd = open(slot->lock_name, O_RDWR | O_CREAT | O_EXCL,
+			     S_IRUSR | S_IWUSR);
 	if (slot->lock_fd == -1)
 		return errno;
 	if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
@@ -214,7 +214,7 @@ unsigned long hash_str(const char *str)
 	if (!s)
 		return h;
 
-	while(*s) {
+	while (*s) {
 		h *= FNV_PRIME;
 		h ^= *s++;
 	}
@@ -342,7 +342,7 @@ int cache_process(int size, const char *path, const char *key, int ttl,
 	strcpy(filename, path);
 	if (filename[len - 1] != '/')
 		filename[len++] = '/';
-	for(i = 0; i < 8; i++) {
+	for (i = 0; i < 8; i++) {
 		sprintf(filename + len++, "%x",
 			(unsigned char)(hash & 0xf));
 		hash >>= 4;
@@ -363,7 +363,7 @@ int cache_process(int size, const char *path, const char *key, int ttl,
 /* Return a strftime formatted date/time
  * NB: the result from this function is to shared memory
  */
-char *sprintftime(const char *format, time_t time)
+static char *sprintftime(const char *format, time_t time)
 {
 	static char buf[64];
 	struct tm *tm;
@@ -407,7 +407,7 @@ int cache_ls(const char *path)
 		*name = '\0';
 	}
 	slot.cache_name = fullname;
-	while((ent = readdir(dir)) != NULL) {
+	while ((ent = readdir(dir)) != NULL) {
 		if (strlen(ent->d_name) != 8)
 			continue;
 		strcpy(name, ent->d_name);
@@ -416,11 +416,11 @@ int cache_ls(const char *path)
 				  fullname, strerror(err), err);
 			continue;
 		}
-		printf("%s %s %10zd %s\n",
+		printf("%s %s %10"PRIuMAX" %s\n",
 		       name,
 		       sprintftime("%Y-%m-%d %H:%M:%S",
 				   slot.cache_st.st_mtime),
-		       slot.cache_st.st_size,
+		       (uintmax_t)slot.cache_st.st_size,
 		       slot.buf);
 		close_slot(&slot);
 	}