Re: Merge conflict in base-3.16

[Michael Davidsaver <mdavidsaver@gmail.com>]

On 09/06/2016 07:04 PM, Andrew Johnson wrote:
> While merging the 3.15 changes into 3.16 I discovered these conflicting
> changes. Which one is correct, and if it's the 3.16 change, should it be
> back-ported to 3.15?

I think yours, though it may not make a difference practically.  If
copyInHeader() only fails in allocRawMsg() fails, in which case I think
no new message is ready to be sent.  In this case I would think that
commitMsg() is either a no-op, or an error.  I haven't look far enough
to tell which is the case.

> Whichever is right, I'm almost done with updating the 3.16 branch.


On 09/06/2016 07:04 PM, Andrew Johnson wrote:
> On the 3.15 branch, Ralph committed this change:
> 
>> ------------------------------------------------------------
>> revno: 12770
>> committer: Ralph Lange <ralph.lange@gmx.de>
>> branch nick: trunk
>> timestamp: Thu 2016-05-26 14:14:56 +0200
>> message:
>>   pcas: fix compiler warning (gcc 5.3.1)
>> diff:
>> === modified file 'src/ca/legacy/pcas/generic/casDGClient.cc'
>> --- src/ca/legacy/pcas/generic/casDGClient.cc   2012-04-12 16:13:50 +0000
>> +++ src/ca/legacy/pcas/generic/casDGClient.cc   2016-05-26 12:14:56 +0000
>> @@ -348,10 +348,8 @@
>>  //
>>  caStatus casDGClient::searchFailResponse ( const caHdrLargeArray * mp )
>>  {
>> -       int             status;
>> -
>>      epicsGuard < epicsMutex > guard ( this->mutex );
>> -    status = this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0,
>> +    this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0,
>>          mp->m_dataType, mp->m_count, mp->m_cid, mp->m_available, 0 );
>>  
>>         this->out.commitMsg ();
> 
> 
> On the 3.16 branch, I committed this change:
> 
>> ------------------------------------------------------------
>> revno: 12695
>> committer: Andrew Johnson <anj@aps.anl.gov>
>> branch nick: 3.16
>> timestamp: Sun 2015-10-18 21:41:46 -0500
>> message:
>>   Clean up g++ unused-but-set-variable warning in pcas
>> diff:
>> === modified file 'src/ca/legacy/pcas/generic/casDGClient.cc'
>> --- src/ca/legacy/pcas/generic/casDGClient.cc   2012-04-12 16:13:50 +0000
>> +++ src/ca/legacy/pcas/generic/casDGClient.cc   2015-10-19 02:41:46 +0000
>> @@ -354,9 +354,11 @@
>>      status = this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0,
>>          mp->m_dataType, mp->m_count, mp->m_cid, mp->m_available, 0 );
>>  
>> -       this->out.commitMsg ();
>> +    if ( status == S_cas_success ) {
>> +        this->out.commitMsg ();
>> +    }
>>  
>> -       return S_cas_success;
>> +    return S_cas_success;
>>  }
>>  
>>  /*
> 
> While merging the 3.15 changes into 3.16 I discovered these conflicting
> changes. Which one is correct, and if it's the 3.16 change, should it be
> back-ported to 3.15?
> 
> Whichever is right, I'm almost done with updating the 3.16 branch.
> 
> - Andrew
>