On Sun, Aug 23, 2015 at 5:50 AM, Per Hedbor () @ Pike (-) developers forum 10353@lyskom.lysator.liu.se wrote:
Ok.. I accidentally commited about half of the changes to 8.1, without the other half (I did a 'git push' but aborted almost directly when I noticed it was pushing 8.1. However, it seems aborting does not stop the commiting, and in this case a lot of the commits were not actually included).
To fix this I just did a merge of the string split to 8.1. I assume there are alternative solutions, but there had been other commits done as well, and the merged commits are spread in time (some are merged), so in order to fix it quickly I just basically did the full commit.
It mostly works, but I did find one problem: some GTK signal connections don't seem to work. Reverting part of the staticification fixes it; I've committed such a reversion to branch rosuav/nonstatic-gtk-strings if anyone wants to eyeball it. Is there any way to verify that the reversion won't break anything?
ChrisA
I am personally much more interrested in why it breaks?
The strings really are static. I assume it could be the lack of trailing \0?
It should not really cause them to compare diffently, but I guess it might?
Changing to S(str,1,2) from S(str,0,2) makes then be zero terminated.
If you have a testcase, please try with that change.
On Mon, Aug 24, 2015 at 2:30 PM, Chris Angelico rosuav@gmail.com wrote:
On Sun, Aug 23, 2015 at 5:50 AM, Per Hedbor () @ Pike (-) developers forum 10353@lyskom.lysator.liu.se wrote:
Ok.. I accidentally commited about half of the changes to 8.1, without the other half (I did a 'git push' but aborted almost directly when I noticed it was pushing 8.1. However, it seems aborting does not stop the commiting, and in this case a lot of the commits were not actually included).
To fix this I just did a merge of the string split to 8.1. I assume there are alternative solutions, but there had been other commits done as well, and the merged commits are spread in time (some are merged), so in order to fix it quickly I just basically did the full commit.
It mostly works, but I did find one problem: some GTK signal connections don't seem to work. Reverting part of the staticification fixes it; I've committed such a reversion to branch rosuav/nonstatic-gtk-strings if anyone wants to eyeball it. Is there any way to verify that the reversion won't break anything?
ChrisA
On Mon, Aug 24, 2015 at 10:48 PM, Per Hedbor per@hedbor.org wrote:
I am personally much more interrested in why it breaks?
The strings really are static. I assume it could be the lack of trailing \0?
It should not really cause them to compare diffently, but I guess it might?
Changing to S(str,1,2) from S(str,0,2) makes then be zero terminated.
If you have a testcase, please try with that change.
Perfect! Thanks. This is why I didn't push anything to the main branch. :) And yes, that makes sense; the error is about how "changedblahblahblahmassivelongstring" isn't a recognized signal.
Since this change does fix the testcase, should I commit it to 8.1?
ChrisA
pike-devel@lists.lysator.liu.se
-
Chris Angelico -
Per Hedbor -
Per Hedbor () ＠ Pike (-) developers forum