github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

completely avoid usage of strnlen()

Browse Source
This commit is contained in:
Christian Kruse
2014-03-06 18:08:10 +01:00
committed by Jaime Casanova
parent 1c67e105ff
commit 24bd4e7a3f
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@@ -140,7 +140,7 @@ parse_config(const char *config_file, t_configuration_options * options)
fclose(fp); fclose(fp);
/* Check config settings */ /* 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")); log_err(_("Cluster name is missing. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);

2
repmgr.c
View File

@@ -1948,7 +1948,7 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
char host_string[MAXLEN]; char host_string[MAXLEN];
int r; int r;
if (strnlen(options.rsync_options, MAXLEN) == 0) if (*options.rsync_options == '\0')
maxlen_snprintf( maxlen_snprintf(
rsync_flags, "%s", rsync_flags, "%s",
"--archive --checksum --compress --progress --rsh=ssh"); "--archive --checksum --compress --progress --rsh=ssh");

11
strutil.c
View File

@@ -29,17 +29,6 @@ static int
xvsnprintf(char *str, size_t size, const char *format, va_list ap) xvsnprintf(char *str, size_t size, const char *format, va_list ap)
__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0))); __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 static int
xvsnprintf(char *str, size_t size, const char *format, va_list ap) xvsnprintf(char *str, size_t size, const char *format, va_list ap)
{ {

5
strutil.h
View File

@@ -43,9 +43,4 @@ extern int
maxlen_snprintf(char *str, const char *format,...) maxlen_snprintf(char *str, const char *format,...)
__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3))); __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_ */ #endif /* _STRUTIL_H_ */