[PATCH][weston 1/2] ivi-layout-transition: Change layout_transition_register return type

Bryce Harrington bryce at osg.samsung.com
Tue Sep 22 14:38:48 PDT 2015


On Tue, Sep 22, 2015 at 02:36:44PM -0700, Bryce Harrington wrote:
> On Mon, Sep 21, 2015 at 02:10:32PM -0300, Lucas Tanure wrote:
> > layout_transition_register could not work and we need to free trans in
> > the calling function.
> > 
> > Signed-off-by: Lucas Tanure <tanure at linux.com>
> 
> LGTM,
> 
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

Both patches landed, along with the other ivi-layout-transition patch.

remote: I: patch #60019 updated using rev 9af00170771fe010df1bab2501fcbfb98ebfc5e0
remote: I: patch #60031 updated using rev 9b5fe423bf7f4f23872a6d678d261b7f995fbd52
remote: I: patch #60032 updated using rev 96db07741f375e28442cbcd3a6471f370da055de
remote: I: 3 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/wayland/weston
   8c15360..96db077  master -> master

 
> > ---
> >  ivi-shell/ivi-layout-transition.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
> > index 6370e8f..8d477b4 100644
> > --- a/ivi-shell/ivi-layout-transition.c
> > +++ b/ivi-shell/ivi-layout-transition.c
> > @@ -27,6 +27,7 @@
> >  #include <assert.h>
> >  #include <stdlib.h>
> >  #include <stdio.h>
> > +#include <stdbool.h>
> >  
> >  #include "ivi-layout-export.h"
> >  #include "ivi-layout-private.h"
> > @@ -181,7 +182,7 @@ ivi_layout_transition_set_create(struct weston_compositor *ec)
> >  	return transitions;
> >  }
> >  
> > -static void
> > +static bool
> >  layout_transition_register(struct ivi_layout_transition *trans)
> >  {
> >  	struct ivi_layout *layout = get_instance();
> > @@ -190,11 +191,12 @@ layout_transition_register(struct ivi_layout_transition *trans)
> >  	node = malloc(sizeof(*node));
> >  	if (node == NULL) {
> >  		weston_log("%s: memory allocation fails\n", __func__);
> > -		return;
> > +		return false;
> >  	}
> >  
> >  	node->transition = trans;
> >  	wl_list_insert(&layout->pending_transition_list, &node->link);
> > +	return true;
> >  }
> >  
> >  static void
> > -- 
> > 2.5.3
> > 
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/wayland-devel
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list