summaryrefslogtreecommitdiff
path: root/src/libopts/compat
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2015-11-25 10:49:30 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2015-11-25 10:57:43 +0100
commitc9c07b7f42183db8bba70c18b4ff7a0220a9b8dc (patch)
treef4391ee9874610e0829c6c864729a1da9456cec0 /src/libopts/compat
parent3c16b3c962f96aa4cea01955d856cedfe5ac4ee0 (diff)
downloadgnutls-c9c07b7f42183db8bba70c18b4ff7a0220a9b8dc.tar.gz
libopts: updated to 5.18.6
Diffstat (limited to 'src/libopts/compat')
-rw-r--r--src/libopts/compat/compat.h2
-rw-r--r--src/libopts/compat/pathfind.c24
-rw-r--r--src/libopts/compat/windows-config.h2
3 files changed, 14 insertions, 14 deletions
diff --git a/src/libopts/compat/compat.h b/src/libopts/compat/compat.h
index 69206a3c14..561d55db3c 100644
--- a/src/libopts/compat/compat.h
+++ b/src/libopts/compat/compat.h
@@ -3,7 +3,7 @@
* compat.h is free software.
* This file is part of AutoGen and AutoOpts.
*
- * AutoGen Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
*
* AutoOpts is available under any one of two licenses. The license
* in use must be one of these two and the choice is under the control
diff --git a/src/libopts/compat/pathfind.c b/src/libopts/compat/pathfind.c
index 6554533d2a..5c477caf07 100644
--- a/src/libopts/compat/pathfind.c
+++ b/src/libopts/compat/pathfind.c
@@ -23,9 +23,9 @@ pathfind( char const * path,
}
#else
-static char* make_absolute( char const *string, char const *dot_path );
-static char* canonicalize_pathname( char *path );
-static char* extract_colon_unit( char* dir, char const *string, int *p_index );
+static char * make_absolute(char const * string, char const * dot_path);
+static char * canonicalize_pathname(char * path);
+static char * extract_colon_unit(char * dir, char const * string, int * p_index);
/**
* local implementation of pathfind.
@@ -52,8 +52,8 @@ pathfind( char const * path,
* FOR each non-null entry in the colon-separated path, DO ...
*/
for (;;) {
- DIR* dirP;
- char* colon_unit = extract_colon_unit( zPath, path, &p_index );
+ DIR * dirP;
+ char * colon_unit = extract_colon_unit( zPath, path, &p_index );
if (colon_unit == NULL)
break;
@@ -69,7 +69,7 @@ pathfind( char const * path,
for (;;) {
struct dirent *entP = readdir( dirP );
- if (entP == (struct dirent*)NULL)
+ if (entP == (struct dirent *)NULL)
break;
/*
@@ -107,10 +107,10 @@ pathfind( char const * path,
* DOT_PATH contains the symbolic location of `.'. This always returns
* a new string, even if STRING was an absolute pathname to begin with.
*/
-static char*
-make_absolute( char const *string, char const *dot_path )
+static char *
+make_absolute( char const * string, char const * dot_path )
{
- char *result;
+ char * result;
int result_len;
if (!dot_path || *string == '/') {
@@ -147,7 +147,7 @@ make_absolute( char const *string, char const *dot_path )
* Non-leading `../'s and trailing `..'s are handled by removing
* portions of the path.
*/
-static char*
+static char *
canonicalize_pathname( char *path )
{
int i, start;
@@ -231,8 +231,8 @@ canonicalize_pathname( char *path )
* return the next one pointed to by (P_INDEX), or NULL if there are no
* more. Advance (P_INDEX) to the character after the colon.
*/
-static char*
-extract_colon_unit( char* pzDir, char const *string, int *p_index )
+static char *
+extract_colon_unit(char * pzDir, char const * string, int * p_index)
{
char * pzDest = pzDir;
int ix = *p_index;
diff --git a/src/libopts/compat/windows-config.h b/src/libopts/compat/windows-config.h
index 78f3202b94..fb4e048e64 100644
--- a/src/libopts/compat/windows-config.h
+++ b/src/libopts/compat/windows-config.h
@@ -9,7 +9,7 @@
*
* This file is part of AutoOpts, a companion to AutoGen.
* AutoOpts is free software.
- * AutoOpts is Copyright (C) 1992-2014 by Bruce Korb - all rights reserved
+ * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved
*
* AutoOpts is available under any one of two licenses. The license
* in use must be one of these two and the choice is under the control