Re: RE : [Tsp-devel] Patch pour le bug 1979

[Eric Noulard]

2007/3/13, Robert de Vries <address@hidden>:
> ALAUX, Virginie wrote:
> > Bonjour,
> >
> > J'ai la version TSP 8.0.2
> > Je te joins le code tsp_session.c auquel j'ai appliqué le patch bug19179-erk1.patch avec 
> la commande "patch -pN < bug19179-erk1.patch"

The command is OK, but I would have put

cd <your_tsp_source>
patch -p0 < /path/to/file.patch

something like
patch -p0 < ../bug19179-erk2-unified-diff.patch


> >
> > Le code :
> Code snippet removed...
> > A la ligne 754:
> >     STRACE_INFO(("Garbage Collector thread found Datapool TERMINATED for session 
> <%d>",X_session_t[i].channel_id));
> > Je pense que cette trace n'est pas incluse dans les accolades du if...
> > Donc j'ai l'erreur : syntax error.
> >
> This is indeed an obvious syntax error. But I can put the blame on Eric
> ( ;-)  ) for not providing a context diff (or unified diff) patch.

Ok that right I just did cvs diff which is indeed a bad idea,
shame on me.

> The patch he provides patches without warning, but the patch application
> does not have any context to work with so it literally replaces and adds
> the lines in the patch on the lines specified in the patch file.
> This will not give the expected results except for the specific version
> of Eric. (next time do diff -u)

Yep right again I've just submitted another patch to the tracker.
the patch has been obtained with:

cvs diff -r TSP_0_8_2 -I "\$.*\$" -u src/core/ctrl/tsp_session.c >
../bug19179-erk2-unified-diff.patch

If anybody can tell me why cvs diff is showing diff in
RCS expansion keyword $Header ...$, I would be glad.
I had to add the cryptic "-I "\$.*\$"" to avoid "spurious" diff.

the new patch is in the tracker:
https://savannah.nongnu.org/bugs/download.php?file_id=12190

> It would be easier to just update to the CVS version.

True you may take the file from CVS:
http://cvs.savannah.nongnu.org/viewcvs/*checkout*/tsp/src/core/ctrl/tsp_session.c?root=tsp

Sorry for the buggy patch :))
--
Erk