From 24bd4e7a3f31b6e608f3c1e111b4cc3fac63536e Mon Sep 17 00:00:00 2001
From: Christian Kruse <cjk@defunct.ch>
Date: Thu, 6 Mar 2014 18:08:10 +0100
Subject: [PATCH] completely avoid usage of strnlen()

---
 config.c  |  2 +-
 repmgr.c  |  2 +-
 strutil.c | 11 -----------
 strutil.h |  5 -----
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/config.c b/config.c
index a992e648..ea2dca75 100644
--- a/config.c
+++ b/config.c
@@ -140,7 +140,7 @@ parse_config(const char *config_file, t_configuration_options * options)
 	fclose(fp);
 
 	/* Check config settings */
-	if (strnlen(options->cluster_name, MAXLEN) == 0)
+	if (*options->cluster_name == '\0')
 	{
 		log_err(_("Cluster name is missing. Check the configuration file.\n"));
 		exit(ERR_BAD_CONFIG);
diff --git a/repmgr.c b/repmgr.c
index fe0294bb..5707802f 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -1948,7 +1948,7 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
 	char		host_string[MAXLEN];
 	int			r;
 
-	if (strnlen(options.rsync_options, MAXLEN) == 0)
+	if (*options.rsync_options == '\0')
 		maxlen_snprintf(
 						rsync_flags, "%s",
 					 "--archive --checksum --compress --progress --rsh=ssh");
diff --git a/strutil.c b/strutil.c
index 091d1e31..018ec3b9 100644
--- a/strutil.c
+++ b/strutil.c
@@ -29,17 +29,6 @@ static int
 xvsnprintf(char *str, size_t size, const char *format, va_list ap)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0)));
 
-/* Add strnlen on platforms that don't have it, like OS X */
-#ifndef strnlen
-size_t
-strnlen(const char *s, size_t n)
-{
-	const char *end = (const char *) memchr(s, '\0', n);
-
-	return (end ? end - s : n);
-}
-#endif
-
 static int
 xvsnprintf(char *str, size_t size, const char *format, va_list ap)
 {
diff --git a/strutil.h b/strutil.h
index 0ef9ed64..d5d37843 100644
--- a/strutil.h
+++ b/strutil.h
@@ -43,9 +43,4 @@ extern int
 maxlen_snprintf(char *str, const char *format,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
 
-/* Add strnlen on platforms that don't have it, like OS X */
-#ifndef strnlen
-extern size_t strnlen(const char *s, size_t n);
-#endif
-
 #endif   /* _STRUTIL_H_ */