delta/git.git/compat/regex, branch pb/commit-editmsg-path

Silence GCC's "cast of pointer to integer of a different size" warning

2015-10-26T20:24:03+00:00

When calculating hashes from pointers, it actually makes sense to cut
off the most significant bits. In that case, said warning does not make
a whole lot of sense.

So let's just work around it by casting the pointer first to intptr_t
and then casting up/down to the final integral type.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

C: have space around && and || operators

2013-10-16T17:26:39+00:00

Correct all hits from

    git grep -e '\(&&\|||\)[^ ]' -e '[^	 ]\(&&\|||\)' -- '*.c'

i.e. && or || operators that are followed by anything but a SP,
or that follow something other than a SP or a HT, so that these
operators have a SP around it when necessary.

We usually refrain from making this kind of a tree-wide change in
order to avoid unnecessary conflicts with other "real work" patches,
but in this case, the end result does not have a potentially
cumbersome tree-wide impact, while this is a tree-wide cleanup.

Fixes to compat/regex/regcomp.c and xdiff/xemit.c are to replace a
HT immediately after && with a SP.

This is based on Felipe's patch to bultin/symbolic-ref.c; I did all
the finding out what other files in the whole tree need to be fixed
and did the fix and also the log message while reviewing that single
liner, so any screw-ups in this version are mine.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

typofix: in-code comments

2013-07-22T23:06:49+00:00

Signed-off-by: Ondřej Bílka 
Signed-off-by: Junio C Hamano

compat/regex/regexec.c: Fix some sparse warnings

2013-04-28T19:24:18+00:00

Sparse issues an "Using plain integer as NULL pointer" warning along
with two "symbol was not declared. Should it be static?" type warnings
for the 'merge_state_with_log' and 'find_recover_state' functions.

In order to suppress the warnings, we replace the use of '0' as a null
pointer constant with NULL and add the static modifier to the function
definitions.

Signed-off-by: Ramsay Jones 
Signed-off-by: Junio C Hamano

compat/regex: fix spelling and grammar in comments

2013-04-12T19:23:44+00:00

Some of these were found using Lucas De Marchi's codespell tool.
Others noticed by Eric Sunshine.

Helped-by: Eric Sunshine 
Signed-off-by: Stefano Lattarini 
Signed-off-by: Jonathan Nieder 
Acked-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

Fix compat/regex ANSIfication on MinGW

2010-08-26T16:25:53+00:00

compat/regexec.c had a weird combination of function declaration in ANSI
style and function definition in K&R style, for example:

 static unsigned
 re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,
      int nregs, int regs_allocated) internal_function;

 static unsigned
 re_copy_regs (regs, pmatch, nregs, regs_allocated)
     struct re_registers *regs;
     regmatch_t *pmatch;
     int nregs, regs_allocated;
 { ... }

with this #define:

 #ifndef _LIBC
 # ifdef __i386__
 #  define internal_function   __attribute ((regparm (3), stdcall))
 # else
 #  define internal_function
 # endif
 #endif

The original version as shown above was fine, but with the ANSIfied
function definition and in the case where internal_function is not empty,
gcc identifies the declaration and definition as different and bails out.

Adding internal_function to the definition doesn't help (it results in
a syntax error); hence, remove it from the subset of declarations that gcc
flags as erroneous.

Signed-off-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

compat/regex: get rid of old-style definition

2010-08-19T22:46:06+00:00

These files mostly used ANSI style function definitions, but with small
number of old-style ones.  Convert them to consistently use ANSI style.

Signed-off-by: Junio C Hamano

compat/regex: define out variables only used under RE_ENABLE_I18N

2010-08-19T20:00:44+00:00

Wrap variables that were only used RE_ENABLE_I18N in `#ifdef
RE_ENABLE_I18N`. This eliminates compiler warnings when compiling with
NO_REGEX=YesPlease.

Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Junio C Hamano

Change regerror() declaration from K&R style to ANSI C (C89)

2010-08-18T21:06:54+00:00

The MSVC headers typedef errcode as int, and thus confused the compiler in
the K&R style definition. ANSI style deconfuses it.

This patch was originally applied as v1.6.5-rc2~23 but needs to be
re-applied since compat/regex was overwritten by Ævar Arnfjörð
Bjarmason with the gawk regex engine.

Signed-off-by: Frank Li 
Signed-off-by: Marius Storm-Olsen 
Acked-by: Johannes Sixt 
Signed-off-by: Junio C Hamano 
Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Junio C Hamano

compat/regex: get the gawk regex engine to compile within git

2010-08-18T21:06:54+00:00

We need to define -DGAWK -DNO_MBSUPPORT so that the gawk regex engine
will compile, and include stdio.h and stddef.h in regex.h. Gawk itself
includes these headers before it includes the regex.h header.

Signed-off-by: Ævar Arnfjörð Bjarmason 
Acked-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano