delta/git.git/compat/regex, branch ah/pack-objects-usage-strings

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

compat/regex: use the regex engine from gawk for compat

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

Change the regex engine in compat to use the gawk engine from the
gawk-devel module in gawk CVS. This engine supports the REG_STARTEND
flag, which was optionally available in Git since v1.7.2-rc0~77^2~1.

The source was grabbed from cvs.savannah.gnu.org:/sources/gawk, and
these are the upstream versions of the files being included:

    regcomp.c               1.4
    regex.h                 1.3
    regex.h                 1.3
    regex_internal.c        1.3
    regex_internal.h        1.3
    regexec.c               1.3

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

msvc: Fix a compiler warning due to an incorrect pointer cast

2010-01-23T00:15:16+00:00

Signed-off-by: Ramsay Jones 
Acked-by: Sebastian Schuberth 
Signed-off-by: Junio C Hamano

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

2009-09-19T03:00:42+00:00

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

Signed-off-by: Frank Li 
Signed-off-by: Marius Storm-Olsen 
Acked-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

Fix typos / spelling in comments

2009-04-23T02:02:12+00:00

Signed-off-by: Mike Ralphson 
Signed-off-by: Junio C Hamano

Use compatibility regex library for OSX/Darwin

2008-09-10T20:36:40+00:00

The standard libc regex library on OSX does not support alternation
in POSIX Basic Regular Expression mode.  This breaks the diff.funcname
functionality on OSX.

To fix this, we use the GNU regex library which is already present in
the compat/ diretory for the MinGW port.  However, simply adding compat/
to the COMPAT_CFLAGS variable causes a conflict between the system
fnmatch.h and the one present in compat/.  To remedy this, move the
regex and fnmatch functionality to their own subdirectories in compat/
so they can be included seperately.

Signed-off-by: Arjen Laarhoven 
Tested-by: Mike Ralphson  (AIX)
Tested-by: Johannes Sixt  (MinGW)
Signed-off-by: Junio C Hamano