Re: Patch 3

[Pavel Machek]

Hi!

> Patch3 includes things, which are not available in pre16 (hmmmm).

Please mail patches inline, zip files are hard to comment on.

--- GNOKII~1.0PR/common/phones/nk6510.c Thu Mar 28 02:08:12 2002
+++ new/common/phones/nk6510.c  Thu Mar 28 15:53:16 2002
@@ -420,8 +420,10 @@
                        unsigned char *s = strchr(message + 27, '\n');

                        if (s) n = s - message - 26;
-                       else n = GSM_MAX_MODEL_LENGTH;
+                         else n = GSM_MAX_MODEL_LENGTH;

You are breaking the indentation, not fixing it.

This looks like bugfix, through:

+                       data->Revision[GNOKII_MIN(n, 
GSM_MAX_REVISION_LENGTH)-1]=0;

Can you separate bugfixes from indentation changes?

> 2.packing/unpacking numbers (used in SMS, Call Divert, etc.) moved to
> gsm-encoding.* (functions + definition). Only then sms stuff compiles
> fine under vc6. It's also good place - this format is used NOT only in
> SMS

That patch looks good.

> 3.debug info in gsm-device.c

I don't see why this is usefull in mainline.

> 4.null struct commented (compiler errors)

Which part is this?

> 5.some things moved from gnokii.h to gsm-common.h (profiles), some to
> gnokii.c, some removed (like ringtones names - as I said, it doesn't
> have sence to speak about recognizing ringtones names for DCT3 phones
> for not uploadable ringtones). Gnokii.h should be removed now.
> 
> 6.some dancall things commented - as I said, it's obsolete, not updated.
> Why is it in source ?
> 
> 7.resolved strchr problems (added terminating 0) in 7110/6510.
> 
> 8.misc.h doesn't have include compat.h. Include Compat.h added to all
> *.c files only when really required. Removed compiler problems because
> of it.

That looks good.

Please separate unneccessary changes like this one out:

@@ -2919,10 +2925,10 @@

        SM_Functions(GOP_Identify, &data, &State);

-       fprintf(stdout, _("IMEI:     %s\n"), imei);
-       fprintf(stdout, _("Manufacturer: %s\n"), manufacturer);
-       fprintf(stdout, _("Model:    %s\n"), model);
-       fprintf(stdout, _("Revision: %s\n"), rev);
+       fprintf(stdout, _("IMEI         : %s\n"), imei);
+       fprintf(stdout, _("Manufacturer : %s\n"), manufacturer);
+       fprintf(stdout, _("Model        : %s\n"), model);
+       fprintf(stdout, _("Revision     : %s\n"), rev);

        return 0;
 }

Ouch, your patch does not apply against CVS/current :-(.

address@hidden:/usr/src/gnokii$ cat /tmp/delme | patch -Esp1
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
1 out of 1 hunk ignored -- saving rejects to file common/gsm-sms.c.rej
2 out of 2 hunks FAILED -- saving rejects to file
common/phones/nk6510.c.rej
2 out of 2 hunks FAILED -- saving rejects to file
common/phones/nk7110.c.rej
1 out of 2 hunks FAILED -- saving rejects to file
include/gsm-common.h.rej
1 out of 2 hunks FAILED -- saving rejects to file
include/gsm-sms.h.rej
6 out of 6 hunks FAILED -- saving rejects to file
win32/gnokii_vc6/gnokii.dsp.rej
address@hidden:/usr/src/gnokii$

[Looks like some patches are already in?]
                                                                        Pavel
-- 
(about SSSCA) "I don't say this lightly.  However, I really think that the U.S.
no longer is classifiable as a democracy, but rather as a plutocracy." --hpa