<div dir="ltr"><div class="gmail_quote"><div dir="ltr">Hi Dawid,<div>thanks. I've managed to apply it, I've been having some issues with my local git copy.</div><div> </div><div>It's already applied in libvirt-php master branch.</div> <div> </div> <div>Sorry for the noise and thanks again!</div><div>Michal</div></div><div class="gmail_extra"> <div class="gmail_quote">2014-06-19 0:05 GMT+02:00 Dawid Zamirski <<a href="mailto:dzamirski@dattobackup.com" target="_blank">dzamirski@dattobackup.com</a>>:<div> <div class="h5"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>On Wed, 2014-06-18 at 22:50 +0200, Michal Novotny wrote: > Hi Dawid, </div><div>> thanks for the information. Well, please rebase to the latest commit > of my master branch and resend, thanks a lot! > > > Michal > </div>Ok, now I'm puzzled. I've rebased the patch from clean master and the diff ended up identical to the original one. To double check, I've also successfully re-applied original mbox file on a fresh git clone, like this: git clone git://<a href="http://libvirt.org/libvirt-php" target="_blank">libvirt.org/libvirt-php</a> git am ~/\[php_PATCH\]_Fix_compiler_warnings_after_int_to_long_conversion.mbox Applying: Fix compiler warnings after int to long conversion It seems that my original patch was correctly generated against remote's master due to: <div> git send-email --no-chain-reply-to --annotate origin/master </div>which means it was made against remote master branch, not my local copy that was "dirty". At this point, I'm not sure what else I can do on my end. Sorry for the noise with such a simple patch... Regards, Dawid <div><div> > > 2014-06-18 22:05 GMT+02:00 Dawid Zamirski <<a href="mailto:dzamirski@dattobackup.com" target="_blank">dzamirski@dattobackup.com</a>>: > Ugh, now I know what happened - my local master branch has > commits I > have not sent pull requests for yet so it wasn't in 100% in > sync with > remote. Do you want me to resend the patch to the ML? > > On Wed, 2014-06-18 at 16:02 -0400, Dawid Zamirski wrote: > > Hi Michal, > > > > I'm pretty sure I did git pull right before sending the > patch. Here's > > what I did exactly: > > > > On master branch: > > > > git pull > > git checkout -b parse-param-fix origin/master > > created original patch & commit > > git format-patch -1 > > git send-email --no-chain-reply-to --annotate > 0001-Use-long-variable-type-for-zend_parse_parameters.patch > > > > then I've noticed the warnings (still on parse-param-fix > branch) > > create patch & commit > > git fetch --all > > git pull --rebase > > git send-email --no-chain-reply-to --annotate origin/master > > > > I guess that before starting the waring fix patch I should > have create a > > new local branch: > > git checkout master > > git pull > > git checkout -b warning-fix origin/master > > > > and then work from there. > > > > Regards, > > Dawid > > > > > > On Wed, 2014-06-18 at 21:28 +0200, Michal Novotny wrote: > > > Hi Dawid, > > > > > > > > > thanks for the patch, I'll apply it when I have time to do > so. > > > However, the patch is not critical as it's in the DPRINTF > debug macro > > > (for production environment you should disable the DEBUG > macro). > > > > > > > > > Also, please make sure you are you the latest git tree (by > running git > > > pull before writing the patch) as I'm having issues > applying some of > > > the patches cleanly. > > > > > > > > > Thanks, > > > Michal > > > > > > > > > 2014-06-18 21:09 GMT+02:00 Dawid Zamirski > <<a href="mailto:dzamirski@dattobackup.com" target="_blank">dzamirski@dattobackup.com</a>>: > > > The previous patch [1] caused compiler warnings > after variable > > > types > > > were changed from int to long and this patch fixes > this. > > > > > > [1] > > > > <a href="https://www.redhat.com/archives/libvir-list/2014-June/msg00835.html" target="_blank">https://www.redhat.com/archives/libvir-list/2014-June/msg00835.html</a> > > > --- > > > src/libvirt-php.c | 8 ++++---- > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/src/libvirt-php.c b/src/libvirt-php.c > > > index 224943d..6d6fa81 100644 > > > --- a/src/libvirt-php.c > > > +++ b/src/libvirt-php.c > > > @@ -3928,7 +3928,7 @@ > > > PHP_FUNCTION(libvirt_domain_send_pointer_event) > > > RETURN_FALSE; > > > } > > > > > > - DPRINTF("%s: x = %d, y = %d, clicked = %d, > release = % > > > d, hostname = %s...\n", PHPFUNC, pos_x, pos_y, > clicked, > > > release, hostname); > > > + DPRINTF("%s: x = %d, y = %d, clicked = %d, > release = % > > > d, hostname = %s...\n", PHPFUNC, (int) pos_x, > (int) pos_y, > > > (int) clicked, release, hostname); > > > ret = vnc_send_pointer_event(hostname, > tmp, pos_x, > > > pos_y, clicked, release); > > > if (ret == 0) { > > > DPRINTF("%s: Pointer event result > is %d\n", > > > PHPFUNC, ret); > > > @@ -4428,7 +4428,7 @@ > PHP_FUNCTION(libvirt_domain_new) > > > numNets = i; > > > > > > snprintf(tmpname, sizeof(tmpname), "% > s-install", > > > name); > > > - DPRINTF("%s: Name is '%s', memMB is %d, > maxmemMB is %d > > > \n", PHPFUNC, tmpname, memMB, maxmemMB); > > > + DPRINTF("%s: Name is '%s', memMB is %d, > maxmemMB is %d > > > \n", PHPFUNC, tmpname, (int) memMB, (int) > maxmemMB); > > > tmp = installation_get_xml(1, > > > conn->conn, tmpname, > memMB, maxmemMB, > > > NULL /* arch */, NULL, vcpus, iso_image, > > > vmDisks, numDisks, > vmNetworks, > > > numNets, > > > @@ -6272,7 +6272,7 @@ > > > PHP_FUNCTION(libvirt_domain_snapshot_delete) > > > GET_SNAPSHOT_FROM_ARGS("r|l",&zsnapshot, > &flags); > > > > > > retval = > virDomainSnapshotDelete(snapshot->snapshot, > > > flags); > > > - DPRINTF("%s: virDomainSnapshotDelete(%p, % > d) returned > > > %d\n", PHPFUNC, snapshot->snapshot, flags, > retval); > > > + DPRINTF("%s: virDomainSnapshotDelete(%p, % > d) returned > > > %d\n", PHPFUNC, snapshot->snapshot, (int) flags, > retval); > > > if (retval == -1) RETURN_FALSE; > > > RETURN_TRUE; > > > } > > > @@ -6772,7 +6772,7 @@ > > > PHP_FUNCTION(libvirt_storagevolume_delete) > > > GET_VOLUME_FROM_ARGS("r| > l",&zvolume,&flags); > > > > > > retval = > virStorageVolDelete(volume->volume, flags); > > > - DPRINTF("%s: virStorageVolDelete(%p, %d) > returned %d > > > \n", PHPFUNC, volume->volume, flags, retval); > > > + DPRINTF("%s: virStorageVolDelete(%p, %d) > returned %d > > > \n", PHPFUNC, volume->volume, (int) flags, > retval); > > > if (retval != 0) { > > > set_error_if_unset("Cannot delete > storage > > > volume" TSRMLS_CC); > > > RETURN_FALSE; > > > -- > > > 1.9.3 > > > > > > -- > > > libvir-list mailing list > > > <a href="mailto:libvir-list@redhat.com" target="_blank">libvir-list@redhat.com</a> > > > > <a href="https://www.redhat.com/mailman/listinfo/libvir-list" target="_blank">https://www.redhat.com/mailman/listinfo/libvir-list</a> > > > > > > > > > > > > > > > </div></div></blockquote></div></div></div> </div> </div> </div>