glob.c fresh from CVS doesn't compile

glob.c fresh from CVS doesn't compile

[Zvi Har'El]

[-- Attachment #1: Type: text/plain, Size: 906 bytes --]

Diagnostics:

glob.c: In function `zglob':
glob.c:1249: error: too many arguments to function `get_strarg'

CVS entry:

/glob.c/1.56/Wed Nov  8 08:49:57 2006//

Patch:


--- Src/glob.c.~20061108084957~	2006-11-08 10:49:57.000000000 +0200
+++ Src/glob.c	2006-11-08 11:00:00.000000000 +0200
@@ -1246,7 +1246,7 @@
 			int arglen;
 
 			/* Find matching delimiters */
-			tt = get_strarg(s, &arglen, NULL);
+			tt = get_strarg(s, &arglen);
 			if (!*tt) {
 			    zerr("missing end of name");
 			    data = 0;
-- 
Dr. Zvi Har'El      mailto:rl@math.technion.ac.il    Department of Mathematics
tel:+972-54-4227607 icq:179294841    Technion - Israel Institute of Technology
fax:+972-4-8293388  http://www.math.technion.ac.il/~rl/    Haifa 32000, ISRAEL
"If you can't say somethin' nice, don't say nothin' at all." -- Thumper (1942)
                         Wednesday, 17 Heshvan 5767,  8 November 2006, 11:01AM

[-- Attachment #2: glob.patch --]
[-- Type: text/plain, Size: 337 bytes --]

--- Src/glob.c.~20061108084957~	2006-11-08 10:49:57.000000000 +0200
+++ Src/glob.c	2006-11-08 11:00:00.000000000 +0200
@@ -1246,7 +1246,7 @@
 			int arglen;
 
 			/* Find matching delimiters */
-			tt = get_strarg(s, &arglen, NULL);
+			tt = get_strarg(s, &arglen);
 			if (!*tt) {
 			    zerr("missing end of name");
 			    data = 0;

Re: glob.c fresh from CVS doesn't compile

[Peter Stephenson]

"Zvi Har'El" <rl@math.technion.ac.il> wrote:
> Diagnostics:
> 
> glob.c: In function `zglob':
> glob.c:1249: error: too many arguments to function `get_strarg'

Sorry, that's the multibyte stuff again.  I think I unapplied too much
before making the patch.

I've committed the hook function change, with a note about the effect of
errors.  Let me know if it seems to need further work.

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


To access the latest news from CSR copy this link into a web browser:  http://www.csr.com/email_sig.php