Skip to content

Commit 024ca8c

Browse files
committed
Merge branch 'cygwin-3_5-branch'
This is more like an experiment, to see what v3.5.5 will bring when it lands. And hoping that some of the gifts might have the result of fixing those hangs/deadlocks I frequently experience when trying to Ctrl+C something in a `tmux` session. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 7fdbd22 + db55d54 commit 024ca8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1131
-746
lines changed

newlib/libc/posix/collate.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE];
5858
void __collate_err(int ex, const char *f);
5959

6060
int
61-
__collate_load_tables(encoding)
62-
char *encoding;
61+
__collate_load_tables(
62+
char *encoding
63+
)
6364
{
6465
char buf[PATH_MAX];
6566
FILE *fp;
@@ -113,8 +114,9 @@ __collate_load_tables(encoding)
113114
}
114115

115116
u_char *
116-
__collate_substitute(s)
117-
const u_char *s;
117+
__collate_substitute(
118+
const u_char *s
119+
)
118120
{
119121
int dest_len, len, nlen;
120122
int delta = strlen((const char *) s);
@@ -143,9 +145,12 @@ __collate_substitute(s)
143145
}
144146

145147
void
146-
__collate_lookup(t, len, prim, sec)
147-
const u_char *t;
148-
int *len, *prim, *sec;
148+
__collate_lookup(
149+
const u_char *t,
150+
int *len,
151+
int *prim,
152+
int *sec
153+
)
149154
{
150155
struct __collate_st_chain_pri *p2;
151156

@@ -165,8 +170,7 @@ __collate_lookup(t, len, prim, sec)
165170
}
166171

167172
u_char *
168-
__collate_strdup(s)
169-
u_char *s;
173+
__collate_strdup(u_char *s)
170174
{
171175
u_char *t = (u_char *) strdup((const char *) s);
172176

newlib/libc/posix/collcmp.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
* "[a-z]"-type ranges with national characters.
4141
*/
4242

43-
int __collate_range_cmp (c1, c2)
44-
int c1, c2;
43+
int __collate_range_cmp (
44+
int c1,
45+
int c2
46+
)
4547
{
4648
static char s1[2], s2[2];
4749
int ret;

newlib/libc/posix/engine.c

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,13 @@ static char *pchar(int ch);
135135
== size_t nmatch, regmatch_t pmatch[], int eflags);
136136
*/
137137
static int /* 0 success, REG_NOMATCH failure */
138-
matcher(g, string, nmatch, pmatch, eflags)
139-
struct re_guts *g;
140-
char *string;
141-
size_t nmatch;
142-
regmatch_t pmatch[];
143-
int eflags;
138+
matcher(
139+
struct re_guts *g,
140+
char *string,
141+
size_t nmatch,
142+
regmatch_t pmatch[],
143+
int eflags
144+
)
144145
{
145146
char *endp;
146147
int i;
@@ -346,12 +347,13 @@ int eflags;
346347
== char *stop, sopno startst, sopno stopst);
347348
*/
348349
static char * /* == stop (success) always */
349-
dissect(m, start, stop, startst, stopst)
350-
struct match *m;
351-
char *start;
352-
char *stop;
353-
sopno startst;
354-
sopno stopst;
350+
dissect(
351+
struct match *m,
352+
char *start,
353+
char *stop,
354+
sopno startst,
355+
sopno stopst
356+
)
355357
{
356358
int i;
357359
sopno ss; /* start sop of current subRE */
@@ -539,13 +541,14 @@ sopno stopst;
539541
== char *stop, sopno startst, sopno stopst, sopno lev);
540542
*/
541543
static char * /* == stop (success) or NULL (failure) */
542-
backref(m, start, stop, startst, stopst, lev)
543-
struct match *m;
544-
char *start;
545-
char *stop;
546-
sopno startst;
547-
sopno stopst;
548-
sopno lev; /* PLUS nesting level */
544+
backref(
545+
struct match *m,
546+
char *start,
547+
char *stop,
548+
sopno startst,
549+
sopno stopst,
550+
sopno lev /* PLUS nesting level */
551+
)
549552
{
550553
int i;
551554
sopno ss; /* start sop of current subRE */
@@ -744,12 +747,13 @@ sopno lev; /* PLUS nesting level */
744747
== char *stop, sopno startst, sopno stopst);
745748
*/
746749
static char * /* where tentative match ended, or NULL */
747-
fast(m, start, stop, startst, stopst)
748-
struct match *m;
749-
char *start;
750-
char *stop;
751-
sopno startst;
752-
sopno stopst;
750+
fast(
751+
struct match *m,
752+
char *start,
753+
char *stop,
754+
sopno startst,
755+
sopno stopst
756+
)
753757
{
754758
states st = m->st;
755759
states fresh = m->fresh;
@@ -835,12 +839,13 @@ sopno stopst;
835839
== char *stop, sopno startst, sopno stopst);
836840
*/
837841
static char * /* where it ended */
838-
slow(m, start, stop, startst, stopst)
839-
struct match *m;
840-
char *start;
841-
char *stop;
842-
sopno startst;
843-
sopno stopst;
842+
slow(
843+
struct match *m,
844+
char *start,
845+
char *stop,
846+
sopno startst,
847+
sopno stopst
848+
)
844849
{
845850
states st = m->st;
846851
states empty = m->empty;
@@ -931,13 +936,14 @@ sopno stopst;
931936
== #define NNONCHAR (CODEMAX-CHAR_MAX)
932937
*/
933938
static states
934-
step(g, start, stop, bef, ch, aft)
935-
struct re_guts *g;
936-
sopno start; /* start state within strip */
937-
sopno stop; /* state after stop state within strip */
938-
states bef; /* states reachable before */
939-
int ch; /* character or NONCHAR code */
940-
states aft; /* states already known reachable after */
939+
step(
940+
struct re_guts *g,
941+
sopno start, /* start state within strip */
942+
sopno stop, /* state after stop state within strip */
943+
states bef, /* states reachable before */
944+
int ch, /* character or NONCHAR code */
945+
states aft /* states already known reachable after */
946+
)
941947
{
942948
cset *cs;
943949
sop s;

newlib/libc/posix/fnmatch.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,12 @@ fnmatch(pattern, string, flags)
163163
}
164164

165165
static int
166-
rangematch(pattern, test, flags, newp)
167-
const char *pattern;
168-
char test;
169-
int flags;
170-
char **newp;
166+
rangematch(
167+
const char *pattern,
168+
char test,
169+
int flags,
170+
char **newp
171+
)
171172
{
172173
int negate, ok;
173174
char c, c2;

0 commit comments

Comments
 (0)