[pisa-src] Re: r1236 - in trunk/community-operator: Makefile.am co_client.c co_common_packets.h co_server.c
- From: Jan Marten <jan.marten@xxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 20 Oct 2009 14:22:36 +0200
> --- trunk/community-operator/Makefile.am Mon Oct 19 17:37:26 2009
> (r1235)
> > +++ trunk/community-operator/Makefile.am Mon Oct 19 20:59:44 2009
> (r1236)
> > @@ -19,6 +19,7 @@
> > INCLUDES += -I@PISA_HIPL_SRCDIR@/libhiptool
> > INCLUDES += -I@PISA_HIPL_SRCDIR@/libdht
> > +INCLUDES += -I@PISA_HIPL_SRCDIR@/opendht
> > INCLUDES += -I@PISA_HIPL_SRCDIR@/hipd
> > INCLUDES += -I@PISA_HIPL_SRCDIR@/i3/i3_client
> > INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjnath/include
>
> Why?
>
I get compile errors without it. I can't find a libdht directory neither in
midauth nor in midauth2.
> @@ -78,110 +118,223 @@
> >
> > - if (!(conn = pisa_hitlist_find(allowed, hit)))
> > + if (!(conn = pisa_hitlist_find(allowed, hit))) {
> > + *reason = DENY_HIT_NOT_ALLOWED;
> > return NULL;
> > - if (conn->expiration < not_before)
> > + }
> > + if (conn->expiration < not_before) {
> > + *reason = DENY_HIT_EXPIRED;
> > return NULL;
> > - if (conn->expiration < not_after)
> > + }
> > + if (conn->expiration < not_after) {
> > not_after = conn->expiration;
> > + }
>
> It seems that this mostly adds useless curly braces. The addition of
> the curly braces mixed in with everything else does make the diff hard
> to read though.
>
There are now two actions within the curly braces, so they are needed maybe
except the last one.
Other related posts: