[libvirt] [php PATCH] Fix compiler warnings after int to long conversion
Dawid Zamirski
dzamirski at dattobackup.com
Wed Jun 18 22:05:30 UTC 2014
On Wed, 2014-06-18 at 22:50 +0200, Michal Novotny wrote:
> Hi Dawid,
> thanks for the information. Well, please rebase to the latest commit
> of my master branch and resend, thanks a lot!
>
>
> Michal
>
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://libvirt.org/libvirt-php
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:
git send-email --no-chain-reply-to --annotate origin/master
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
>
> 2014-06-18 22:05 GMT+02:00 Dawid Zamirski <dzamirski at dattobackup.com>:
> 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
> <dzamirski at dattobackup.com>:
> > > The previous patch [1] caused compiler warnings
> after variable
> > > types
> > > were changed from int to long and this patch fixes
> this.
> > >
> > > [1]
> > >
> https://www.redhat.com/archives/libvir-list/2014-June/msg00835.html
> > > ---
> > > 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
> > > libvir-list at redhat.com
> > >
> https://www.redhat.com/mailman/listinfo/libvir-list
> > >
> > >
> >
> >
>
>
>
>
>
More information about the libvir-list
mailing list