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

[ALAUX, Virginie]

Hello,

The new patch is OK for compilation.
We will test it later.
Thanks

Virginie


-----Original Message-----
From: Eric Noulard [mailto:address@hidden
Sent: Tuesday, March 13, 2007 2:49 PM
To: Transport Sample Protocol development list
Subject: Re: RE : [Tsp-devel] Patch pour le bug 1979


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


_______________________________________________
Tsp-devel mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/tsp-devel

Ce courriel (incluant ses eventuelles pieces jointes) peut contenir des 
informations confidentielles et/ou protegees ou dont la diffusion est 
restreinte. Si vous avez recu ce courriel par erreur, vous ne devez ni le 
copier, ni l'utiliser, ni en divulguer le contenu a quiconque. Merci d'en 
avertir immediatement l'expediteur et d'effacer ce courriel de votre systeme. 
Astrium decline toute responsabilite en cas de corruption par virus, 
d'alteration ou de falsification de ce courriel lors de sa transmission par 
voie electronique.

This email (including any attachments) may contain confidential and/or 
privileged information or information otherwise protected from disclosure. If 
you are not the intended recipient, please notify the sender immediately, do 
not copy this message or any attachments and do not use it for any purpose or 
disclose its content to any person, but delete this message and any attachments 
from your system. Astrium disclaims any and all liability if this email 
transmission was virus corrupted, altered or falsified.
---------------------------------------------------------------------
Astrium SAS (393 341 516 RCS Paris) - Siege social: 6 rue Laurent Pichat, 75016 
Paris, France