From d6da1ead5c8eeb91eaa7cc80648cfbc87ac1ff92 Mon Sep 17 00:00:00 2001
From: Patrick Winnertz <winnie@debian.org>
Date: Tue, 10 Feb 2009 13:24:04 +0100
Subject: [PATCH] Revert "cleanup: mhl_str_dir_plus_file(): int -> size_t
(suggested by Andrew Borodin)"
This reverts commit 80a68972718b68c5c5ae050999b187f1676c653b.
---
mhl/string.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mhl/string.h b/mhl/string.h
index ee74e1d48..f4c56e5ec 100644
--- a/mhl/string.h
+++ b/mhl/string.h
@@ -149,11 +149,11 @@ static inline char* mhl_str_dir_plus_file(const char* dirname, const char* filen
filename++;
/* skip trailing slashes on dirname */
- size_t dnlen = strlen(dirname);
- while ((dnlen != 0) && (dirname[dnlen-1]=='/'))
+ int dnlen = strlen(dirname);
+ while (dnlen && (dirname[dnlen-1]=='/'))
dnlen--;
- size_t fnlen = strlen(filename);
+ int fnlen = strlen(filename);
char* buffer = mhl_mem_alloc_z(dnlen+fnlen+2); /* enough space for dirname, /, filename, zero */
char* ptr = buffer;