[Toybox] sort.c patch, was: Re: PM: code style, was: Re: New Subscriber
Frank Bergmann
toybox at tuxad.com
Mon Feb 13 23:25:26 PST 2012
Hi,
On Mon, Feb 13, 2012 at 09:45:10PM -0600, Rob Landley wrote:
> Unfortunately, when I cut and paste the patch you sent, the result is
> whitespace damaged (all tabs expanded to spaces) so doesn't apply
it is always possible that an editor has a bad default config but in this
case it is not the cause:
[fwb at vdr toybox]$ diff -u toybox/toys/sort.c toybox-cloned-1329201307/toys/sort.c
[fwb at vdr toybox]$ diff -u toybox/toys/sort.c toybox-cloned-1328632507/toys/sort.c
--- toybox/toys/sort.c 2012-02-07 17:33:27.000000000 +0100
+++ toybox-cloned-1328632507/toys/sort.c 2012-02-07
17:35:07.000000000 +0100
@@ -308,7 +308,7 @@
if (CFG_SORT_BIG && (toys.optflags&FLAG_c)) {
int j = (toys.optflags&FLAG_u) ? -1 : 0;
- if (TT.lines && compare_keys((void *)&TT.lines, &line)>j)
+ if (TT.lines && compare_keys((char **)&TT.lines, &line)>j)
error_exit("%s: Check line %d\n", name, TT.linecount);
free(TT.lines);
TT.lines = (char **)line;
(This was C&P and has of course space indents.)
I will check my mail config.
Frank
--
EDV Frank Bergmann Tel. 05221-9249753
LPIC-3 Linux Professional Fax 05221-9249754
Pödinghauser Str. 5 email iservice at tuxad.com
32051 Herford USt-IdNr DE237314606
1329204326.0
More information about the Toybox
mailing list