diff options
Diffstat (limited to 'lib-src')
-rw-r--r-- | lib-src/ebrowse.c | 14 | ||||
-rw-r--r-- | lib-src/etags.c | 86 | ||||
-rw-r--r-- | lib-src/hexl.c | 2 | ||||
-rw-r--r-- | lib-src/movemail.c | 4 | ||||
-rw-r--r-- | lib-src/pop.c | 20 |
5 files changed, 63 insertions, 63 deletions
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index a997e56cc9f..7395f2c8fdd 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -45,16 +45,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* The character used as a separator in path lists (like $PATH). */ -#if defined(__MSDOS__) +#if defined (__MSDOS__) #define PATH_LIST_SEPARATOR ';' -#define FILENAME_EQ(X,Y) (strcasecmp(X,Y) == 0) +#define FILENAME_EQ(X,Y) (strcasecmp (X,Y) == 0) #else -#if defined(WINDOWSNT) +#if defined (WINDOWSNT) #define PATH_LIST_SEPARATOR ';' -#define FILENAME_EQ(X,Y) (stricmp(X,Y) == 0) +#define FILENAME_EQ(X,Y) (stricmp (X,Y) == 0) #else #define PATH_LIST_SEPARATOR ':' -#define FILENAME_EQ(X,Y) (streq(X,Y)) +#define FILENAME_EQ(X,Y) (streq (X,Y)) #endif #endif /* The default output file name. */ @@ -2511,7 +2511,7 @@ member (struct sym *cls, int vis) /* A function or class may follow. */ case TEMPLATE: - MATCH(); + MATCH (); SET_FLAG (flags, F_TEMPLATE); /* Skip over template argument list */ SKIP_MATCHING_IF ('<'); @@ -2930,7 +2930,7 @@ parse_qualified_ident_or_type (char **last_id) } while (enter--) - leave_namespace(); + leave_namespace (); return cls; } diff --git a/lib-src/etags.c b/lib-src/etags.c index ac5ebee9b07..cdcc6461a64 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -103,7 +103,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4"; # define PTR void * # endif #else /* no config.h */ -# if defined(__STDC__) && (__STDC__ || defined(__SUNPRO_C)) +# if defined (__STDC__) && (__STDC__ || defined (__SUNPRO_C)) # define PTR void * /* for generic pointers */ # else /* not standard C */ # define const /* remove const for old compilers' sake */ @@ -202,25 +202,25 @@ If you want regular expression support, you should delete this notice and # define CTAGS FALSE #endif -#define streq(s,t) (assert((s)!=NULL || (t)!=NULL), !strcmp (s, t)) -#define strcaseeq(s,t) (assert((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t)) -#define strneq(s,t,n) (assert((s)!=NULL || (t)!=NULL), !strncmp (s, t, n)) -#define strncaseeq(s,t,n) (assert((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n)) +#define streq(s,t) (assert ((s)!=NULL || (t)!=NULL), !strcmp (s, t)) +#define strcaseeq(s,t) (assert ((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t)) +#define strneq(s,t,n) (assert ((s)!=NULL || (t)!=NULL), !strncmp (s, t, n)) +#define strncaseeq(s,t,n) (assert ((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n)) #define CHARS 256 /* 2^sizeof(char) */ #define CHAR(x) ((unsigned int)(x) & (CHARS - 1)) -#define iswhite(c) (_wht[CHAR(c)]) /* c is white (see white) */ -#define notinname(c) (_nin[CHAR(c)]) /* c is not in a name (see nonam) */ -#define begtoken(c) (_btk[CHAR(c)]) /* c can start token (see begtk) */ -#define intoken(c) (_itk[CHAR(c)]) /* c can be in token (see midtk) */ -#define endtoken(c) (_etk[CHAR(c)]) /* c ends tokens (see endtk) */ +#define iswhite(c) (_wht[CHAR (c)]) /* c is white (see white) */ +#define notinname(c) (_nin[CHAR (c)]) /* c is not in a name (see nonam) */ +#define begtoken(c) (_btk[CHAR (c)]) /* c can start token (see begtk) */ +#define intoken(c) (_itk[CHAR (c)]) /* c can be in token (see midtk) */ +#define endtoken(c) (_etk[CHAR (c)]) /* c ends tokens (see endtk) */ -#define ISALNUM(c) isalnum (CHAR(c)) -#define ISALPHA(c) isalpha (CHAR(c)) -#define ISDIGIT(c) isdigit (CHAR(c)) -#define ISLOWER(c) islower (CHAR(c)) +#define ISALNUM(c) isalnum (CHAR (c)) +#define ISALPHA(c) isalpha (CHAR (c)) +#define ISDIGIT(c) isdigit (CHAR (c)) +#define ISLOWER(c) islower (CHAR (c)) -#define lowcase(c) tolower (CHAR(c)) +#define lowcase(c) tolower (CHAR (c)) /* @@ -1725,16 +1725,16 @@ init (void) register int i; for (i = 0; i < CHARS; i++) - iswhite(i) = notinname(i) = begtoken(i) = intoken(i) = endtoken(i) = FALSE; + iswhite (i) = notinname (i) = begtoken (i) = intoken (i) = endtoken (i) = FALSE; for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = TRUE; for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = TRUE; - notinname('\0') = notinname('\n'); + notinname ('\0') = notinname ('\n'); for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = TRUE; - begtoken('\0') = begtoken('\n'); + begtoken ('\0') = begtoken ('\n'); for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = TRUE; - intoken('\0') = intoken('\n'); + intoken ('\0') = intoken ('\n'); for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = TRUE; - endtoken('\0') = endtoken('\n'); + endtoken ('\0') = endtoken ('\n'); } /* @@ -3959,16 +3959,16 @@ Yacc_entries (FILE *inf) ) #define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \ - ((assert("" kw), TRUE) /* syntax error if not a literal string */ \ - && strneq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \ - && notinname ((cp)[sizeof(kw)-1]) /* end of kw */ \ - && ((cp) = skip_spaces((cp)+sizeof(kw)-1))) /* skip spaces */ + ((assert ("" kw), TRUE) /* syntax error if not a literal string */ \ + && strneq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \ + && notinname ((cp)[sizeof (kw)-1]) /* end of kw */ \ + && ((cp) = skip_spaces ((cp)+sizeof (kw)-1))) /* skip spaces */ /* Similar to LOOKING_AT but does not use notinname, does not skip */ #define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \ - ((assert("" kw), TRUE) /* syntax error if not a literal string */ \ - && strncaseeq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \ - && ((cp) += sizeof(kw)-1)) /* skip spaces */ + ((assert ("" kw), TRUE) /* syntax error if not a literal string */ \ + && strncaseeq ((cp), kw, sizeof (kw)-1) /* cp points at kw */ \ + && ((cp) += sizeof (kw)-1)) /* skip spaces */ /* * Read a file, but do no processing. This is used to do regexp @@ -4141,7 +4141,7 @@ Ada_getit (FILE *inf, const char *name_qualifier) readline (&lb, inf); dbp = lb.buffer; } - switch (lowcase(*dbp)) + switch (lowcase (*dbp)) { case 'b': if (nocase_tail ("body")) @@ -4245,7 +4245,7 @@ Ada_funcs (FILE *inf) } /* We are at the beginning of a token. */ - switch (lowcase(*dbp)) + switch (lowcase (*dbp)) { case 'f': if (!packages_only && nocase_tail ("function")) @@ -4371,7 +4371,7 @@ Perl_functions (FILE *inf) *cp = '\0'; name = concat (package, "::", sp); *cp = savechar; - make_tag (name, strlen(name), TRUE, + make_tag (name, strlen (name), TRUE, lb.buffer, cp - lb.buffer + 1, lineno, linecharno); free (name); } @@ -4466,9 +4466,9 @@ PHP_functions (FILE *inf) } else if (LOOKING_AT (cp, "function")) { - if(*cp == '&') + if (*cp == '&') cp = skip_spaces (cp+1); - if(*cp != '\0') + if (*cp != '\0') { name = cp; while (!notinname (*cp)) @@ -4509,7 +4509,7 @@ PHP_functions (FILE *inf) && *cp == '$') { name = cp; - while (!notinname(*cp)) + while (!notinname (*cp)) cp++; make_tag (name, cp - name, FALSE, lb.buffer, cp - lb.buffer + 1, lineno, linecharno); @@ -4890,13 +4890,13 @@ Forth_words (FILE *inf) LOOP_ON_INPUT_LINES (inf, lb, bp) while ((bp = skip_spaces (bp))[0] != '\0') - if (bp[0] == '\\' && iswhite(bp[1])) + if (bp[0] == '\\' && iswhite (bp[1])) break; /* read next line */ - else if (bp[0] == '(' && iswhite(bp[1])) + else if (bp[0] == '(' && iswhite (bp[1])) do /* skip to ) or eol */ bp++; while (*bp != ')' && *bp != '\0'); - else if ((bp[0] == ':' && iswhite(bp[1]) && bp++) + else if ((bp[0] == ':' && iswhite (bp[1]) && bp++) || LOOKING_AT_NOCASE (bp, "constant") || LOOKING_AT_NOCASE (bp, "code") || LOOKING_AT_NOCASE (bp, "create") @@ -5285,7 +5285,7 @@ Prolog_functions (FILE *inf) /* Predicate or rule. Store the function name so that we only generate a tag for the first clause. */ if (last == NULL) - last = xnew(len + 1, char); + last = xnew (len + 1, char); else if (len + 1 > allocated) xrnew (last, len + 1, char); allocated = len + 1; @@ -5309,7 +5309,7 @@ prolog_skip_comment (linebuffer *plb, FILE *inf) return; readline (plb, inf); } - while (!feof(inf)); + while (!feof (inf)); } /* @@ -5368,11 +5368,11 @@ prolog_atom (char *s, size_t pos) origpos = pos; - if (ISLOWER(s[pos]) || (s[pos] == '_')) + if (ISLOWER (s[pos]) || (s[pos] == '_')) { /* The atom is unquoted. */ pos++; - while (ISALNUM(s[pos]) || (s[pos] == '_')) + while (ISALNUM (s[pos]) || (s[pos] == '_')) { pos++; } @@ -5715,7 +5715,7 @@ add_regex (char *regexp_pattern, language *lang) single_line = FALSE; /* dot does not match newline */ - if (strlen(regexp_pattern) < 3) + if (strlen (regexp_pattern) < 3) { error ("null regexp", (char *)NULL); return; @@ -6626,7 +6626,7 @@ filename_is_absolute (char *fn) { return (fn[0] == '/' #ifdef DOS_NT - || (ISALPHA(fn[0]) && fn[1] == ':' && fn[2] == '/') + || (ISALPHA (fn[0]) && fn[1] == ':' && fn[2] == '/') #endif ); } @@ -6641,7 +6641,7 @@ canonicalize_filename (register char *fn) #ifdef DOS_NT /* Canonicalize drive letter case. */ -# define ISUPPER(c) isupper (CHAR(c)) +# define ISUPPER(c) isupper (CHAR (c)) if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0])) fn[0] = lowcase (fn[0]); diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 89ea7d9f60c..f03663ef5be 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -48,7 +48,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1; int group_by = DEFAULT_GROUPING; char *progname; -void usage(void) NO_RETURN; +void usage (void) NO_RETURN; int main (int argc, char **argv) diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 097bf23c202..b6ea51f6341 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -183,8 +183,8 @@ main (int argc, char **argv) # define ARGSTR "p" #endif /* MAIL_USE_POP */ - uid_t real_gid = getgid(); - uid_t priv_gid = getegid(); + uid_t real_gid = getgid (); + uid_t priv_gid = getegid (); #ifdef WINDOWSNT /* Ensure all file i/o is in binary mode. */ diff --git a/lib-src/pop.c b/lib-src/pop.c index a94e06fbd87..ae1000742cc 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -34,15 +34,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "ntlib.h" #include <winsock.h> #undef SOCKET_ERROR -#define RECV(s,buf,len,flags) recv(s,buf,len,flags) -#define SEND(s,buf,len,flags) send(s,buf,len,flags) -#define CLOSESOCKET(s) closesocket(s) +#define RECV(s,buf,len,flags) recv (s,buf,len,flags) +#define SEND(s,buf,len,flags) send (s,buf,len,flags) +#define CLOSESOCKET(s) closesocket (s) #else #include <netinet/in.h> #include <sys/socket.h> -#define RECV(s,buf,len,flags) read(s,buf,len) -#define SEND(s,buf,len,flags) write(s,buf,len) -#define CLOSESOCKET(s) close(s) +#define RECV(s,buf,len,flags) read (s,buf,len) +#define SEND(s,buf,len,flags) write (s,buf,len) +#define CLOSESOCKET(s) close (s) #endif #include <pop.h> @@ -101,7 +101,7 @@ extern char *krb_realmofhost (/* char * */); #endif /* KERBEROS */ #ifndef WINDOWSNT -#if !defined(HAVE_H_ERRNO) || !defined(HAVE_CONFIG_H) +#if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H) extern int h_errno; #endif #endif @@ -1067,7 +1067,7 @@ socket_connection (char *host, int flags) } #ifdef HAVE_GETADDRINFO - memset (&hints, 0, sizeof(hints)); + memset (&hints, 0, sizeof (hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; hints.ai_family = AF_INET; @@ -1159,7 +1159,7 @@ socket_connection (char *host, int flags) krb5_free_context (kcontext); strcpy (pop_error, KRB_ERROR); strncat (pop_error, error_message (rem), - ERROR_MAX - sizeof(KRB_ERROR)); + ERROR_MAX - sizeof (KRB_ERROR)); CLOSESOCKET (sock); return (-1); } @@ -1212,7 +1212,7 @@ socket_connection (char *host, int flags) ERROR_MAX - strlen (pop_error) - 1); } #elif defined HAVE_KRB5_ERROR_E_TEXT - if (err_ret && err_ret->e_text && strlen(*err_ret->e_text)) + if (err_ret && err_ret->e_text && strlen (*err_ret->e_text)) { strncat (pop_error, " [server says '", ERROR_MAX - strlen (pop_error) - 1); |