This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project iwhd.git.
The branch, master has been updated
via dded28ea3564271e258d14014dd6089f2bfa7cda (commit)
via b49e121de992338353ccb8427b3e557ef73603cc (commit)
via 89c0b8cace3fe481792e1380e620ac68b060963a (commit)
from 69e5866ad141e535969075fccabcd73f2598a721 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/iwhd.git/commit/dded28ea3564271e258d14014dd6089f2bfa7cda
commit dded28ea3564271e258d14014dd6089f2bfa7cda
Author: Jeff Darcy <jdarcy(a)redhat.com>
Date: Fri Oct 1 13:04:44 2010 -0400
Fix various issues in policy syntax.
Made AND/OR properly associative/recursive.
Gave NOT lower precedence than comparisons.
Simplified field/link_field parsing.
Generally improved whitespace handling.
Updated diff to match other changes.
diff --git a/query.c.diff b/query.c.diff
index 8a882bc..22b8f7e 100644
--- a/query.c.diff
+++ b/query.c.diff
@@ -1,6 +1,6 @@
---- query-orig.c 2010-09-23 16:19:31.543661275 +0200
-+++ query.c 2010-09-23 16:19:31.547897591 +0200
-@@ -537,7 +537,7 @@ YY_LOCAL(int) yyrefill(void)
+--- query-orig.c 2010-10-01 12:56:20.000000000 -0400
++++ query.c 2010-10-01 12:56:20.000000000 -0400
+@@ -538,7 +538,7 @@ YY_LOCAL(int) yyrefill(void)
while (yybuflen - yypos < 512)
{
yybuflen *= 2;
@@ -9,7 +9,7 @@
}
YY_INPUT((yybuf + yypos), yyn, (yybuflen - yypos));
if (!yyn) return 0;
-@@ -602,7 +602,7 @@ YY_LOCAL(void) yyDo(yyaction action, int
+@@ -603,7 +603,7 @@ YY_LOCAL(void) yyDo(yyaction action, int
while (yythunkpos >= yythunkslen)
{
yythunkslen *= 2;
@@ -18,7 +18,7 @@
}
yythunks[yythunkpos].begin= begin;
yythunks[yythunkpos].end= end;
-@@ -620,7 +620,7 @@ YY_LOCAL(int) yyText(int begin, int end)
+@@ -621,7 +621,7 @@ YY_LOCAL(int) yyText(int begin, int end)
while (yytextlen < (yyleng - 1))
{
yytextlen *= 2;
@@ -27,7 +27,7 @@
}
memcpy(yytext, yybuf + begin, yyleng);
}
-@@ -1154,13 +1154,13 @@ YY_PARSE(int) YYPARSEFROM(yyrule yystart
+@@ -1159,13 +1159,13 @@ YY_PARSE(int) YYPARSEFROM(yyrule yystart
if (!yybuflen)
{
yybuflen= 1024;
diff --git a/query.leg b/query.leg
index 4a47943..d04429f 100644
--- a/query.leg
+++ b/query.leg
@@ -361,7 +361,8 @@ _print_value (const value_t *v, int level)
case T_LINK:
printf("%*sLINKn",level,"");
_print_value(v->as_tree.left,level+2);
- printf("%*sDEST FIELD%sn",level+2,"",(char *)v->as_tree.right);
+ printf("%*sDEST FIELD %sn",level+2,"",
+ (char *)v->as_tree.right);
break;
default:
printf("%*sUNKNOWN %dn",level,"",v->type);
@@ -463,32 +464,31 @@ eval (const value_t *v, getter_t *oget, getter_t *sget)
Stmt = - BoolExpr - EOL { *cur_expr = $$; }
| ( !EOL . )* EOL
-BoolExpr = l:CompExpr (
- ( - AND - r:CompExpr )
+BoolExpr = l:NotExpr
+ ( ( - AND - r:NotExpr )
{ $$ = l = make_tree(T_AND,l,r); }
- ( - OR - r:CompExpr )
- { $$ = l = make_tree(T_OR,l,r); }
-)* -
+ | ( - OR - r:NotExpr )
+ { $$ = l = make_tree(T_OR,l,r); } )*
-CompExpr = l:Unary
- ( ( - LESS - r:Unary { $$ = make_comp(C_LESSTHAN,l,r); } )
- | ( - LESS EQUAL - r:Unary { $$ = make_comp(C_LESSOREQ,l,r); } )
- | ( - EQUAL EQUAL - r:Unary { $$ = make_comp(C_EQUAL,l,r); } )
- | ( - NOT EQUAL - r:Unary { $$ = make_comp(C_DIFFERENT,l,r); } )
- | ( - GREATER EQUAL - r:Unary { $$ = make_comp(C_GREATEROREQ,l,r); } )
- | ( - GREATER - r:Unary { $$ = make_comp(C_GREATERTHAN,l,r); } ) )? -
+NotExpr = CompExpr -
+ | NOT - e:CompExpr - { $$ = make_tree(T_NOT,e,NULL); }
-Unary = Atom -
- | NOT - e:Unary - { $$ = make_tree(T_NOT,e,NULL); }
+CompExpr = l:Atom
+ ( ( - LESS - r:Atom { $$ = make_comp(C_LESSTHAN,l,r); } )
+ | ( - LESS EQUAL - r:Atom { $$ = make_comp(C_LESSOREQ,l,r); } )
+ | ( - EQUAL EQUAL - r:Atom { $$ = make_comp(C_EQUAL,l,r); } )
+ | ( - NOT EQUAL - r:Atom { $$ = make_comp(C_DIFFERENT,l,r); } )
+ | ( - GREATER EQUAL - r:Atom { $$ = make_comp(C_GREATEROREQ,l,r); } )
+ | ( - GREATER - r:Atom { $$ = make_comp(C_GREATERTHAN,l,r); } ) )?
-Atom = ( Literal | LinkField | ParenExpr ) -
+Atom = ( Literal | LinkField | ParenExpr )
Literal = NUMBER | STRING | TIME
-LinkField = f:Field ( DOT i:ID { $$ = f = make_link(f,i); } )* -
+LinkField = f:Field ( DOT i:ID { $$ = f = make_link(f,i); } )*
-Field = DOLLAR i:ID - { $$ = make_string((char *)i,T_OFIELD); }
- | WAFFLE i:ID - { $$ = make_string((char *)i,T_SFIELD); }
+Field = DOLLAR i:ID { $$ = make_string((char *)i,T_OFIELD); }
+ | WAFFLE i:ID { $$ = make_string((char *)i,T_SFIELD); }
ParenExpr = OPEN - v:BoolExpr - CLOSE - { $$ = v; }
http://repo.or.cz/w/iwhd.git/commit/b49e121de992338353ccb8427b3e557ef73603cc
commit b49e121de992338353ccb8427b3e557ef73603cc
Author: Jeff Darcy <jdarcy(a)redhat.com>
Date: Fri Oct 1 12:11:23 2010 -0400
Fix memory leak, uninit var, syntax
Another ms leak in proxy_get_attr
Uninitialized variable in repl_oget
Whitespace issues in policy syntax
diff --git a/proxy.c b/proxy.c
index 270928d..e89b3df 100644
--- a/proxy.c
+++ b/proxy.c
@@ -806,7 +806,7 @@ char *
repl_oget (void *ctx, const char *id)
{
query_ctx_t *qctx = ctx;
- char *cur_value;
+ char *cur_value = NULL;
(void)meta_get_value(qctx->cur_bucket,qctx->cur_key,id,&cur_value);
diff --git a/query.leg b/query.leg
index d950aa2..4a47943 100644
--- a/query.leg
+++ b/query.leg
@@ -471,12 +471,12 @@ BoolExpr = l:CompExpr (
)* -
CompExpr = l:Unary
- ( ( LESS - r:Unary { $$ = make_comp(C_LESSTHAN,l,r); } )
- | ( LESS EQUAL - r:Unary { $$ = make_comp(C_LESSOREQ,l,r); } )
- | ( EQUAL EQUAL - r:Unary { $$ = make_comp(C_EQUAL,l,r); } )
- | ( NOT EQUAL - r:Unary { $$ = make_comp(C_DIFFERENT,l,r); } )
- | ( GREATER EQUAL - r:Unary { $$ = make_comp(C_GREATEROREQ,l,r); } )
- | ( GREATER - r:Unary { $$ = make_comp(C_GREATERTHAN,l,r); } ) )? -
+ ( ( - LESS - r:Unary { $$ = make_comp(C_LESSTHAN,l,r); } )
+ | ( - LESS EQUAL - r:Unary { $$ = make_comp(C_LESSOREQ,l,r); } )
+ | ( - EQUAL EQUAL - r:Unary { $$ = make_comp(C_EQUAL,l,r); } )
+ | ( - NOT EQUAL - r:Unary { $$ = make_comp(C_DIFFERENT,l,r); } )
+ | ( - GREATER EQUAL - r:Unary { $$ = make_comp(C_GREATEROREQ,l,r); } )
+ | ( - GREATER - r:Unary { $$ = make_comp(C_GREATERTHAN,l,r); } ) )? -
Unary = Atom -
| NOT - e:Unary - { $$ = make_tree(T_NOT,e,NULL); }
@@ -490,7 +490,7 @@ LinkField = f:Field ( DOT i:ID { $$ = f = make_link(f,i); } )* -
Field = DOLLAR i:ID - { $$ = make_string((char *)i,T_OFIELD); }
| WAFFLE i:ID - { $$ = make_string((char *)i,T_SFIELD); }
-ParenExpr = OPEN v:BoolExpr CLOSE - { $$ = v; }
+ParenExpr = OPEN - v:BoolExpr - CLOSE - { $$ = v; }
NUMBER = < [0-9]+ > { $$ = make_number(yytext); }
STRING = '"' < [^"]* > '"' { $$ =
make_string(yytext,T_STRING); }
diff --git a/rest.c b/rest.c
index 6db9a04..8df596a 100644
--- a/rest.c
+++ b/rest.c
@@ -568,6 +568,7 @@ proxy_get_attr (void *cctx, struct MHD_Connection *conn, const char
*url,
MHD_queue_response(conn,rc,resp);
MHD_destroy_response(resp);
+ free_ms(ms);
return MHD_YES;
}
http://repo.or.cz/w/iwhd.git/commit/89c0b8cace3fe481792e1380e620ac68b060963a
commit 89c0b8cace3fe481792e1380e620ac68b060963a
Author: Jeff Darcy <jdarcy(a)redhat.com>
Date: Fri Oct 1 12:08:31 2010 -0400
New version reflecting current reality/terminology/etc.
diff --git a/doc/image_repo.odt b/doc/image_repo.odt
index 1264942..b77f1f8 100644
Binary files a/doc/image_repo.odt and b/doc/image_repo.odt differ
-----------------------------------------------------------------------
Summary of changes:
doc/image_repo.odt | Bin 22353 -> 24309 bytes
proxy.c | 2 +-
query.c.diff | 12 ++++++------
query.leg | 40 ++++++++++++++++++++--------------------
rest.c | 1 +
5 files changed, 28 insertions(+), 27 deletions(-)
repo.or.cz automatic notification. Contact project admin jim(a)meyering.net
if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive
no reply.
--
iwhd.git ("image warehouse daemon")