<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/2a6538ac47b0d2c3522d9138fcabb818a9f3ee5c">https://github.com/macports/macports-base/commit/2a6538ac47b0d2c3522d9138fcabb818a9f3ee5c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2a6538a Fix searching for registry entries by an empty string
</span>2a6538a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2a6538ac47b0d2c3522d9138fcabb818a9f3ee5c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Mar 7 07:24:46 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> Fix searching for registry entries by an empty string
</span>---
src/registry2.0/entry.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/entry.c b/src/registry2.0/entry.c
</span><span style='display:block; white-space:pre;color:#808080;'>index c337cc7..abb6298 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,11 +251,7 @@ static strategy_type strategies[] = {
</span> static int entry_search(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]) {
int i, j;
reg_registry* reg = registry_for(interp, reg_attached);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((objc > 2) && ((Tcl_GetString(objv[2])[0] == '-')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ? (objc % 2 == 0) : (objc % 2 == 1))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_WrongNumArgs(interp, 2, objv, "search ?options? ?key value ...?");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (reg == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (reg == NULL) {
</span> return TCL_ERROR;
} else {
char** keys;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,8 +282,7 @@ static int entry_search(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]) {
</span> if (strategies[strat_index].strategy != reg_strategy_null) {
/* this key must also have a value */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Tcl_GetStringFromObj(objv[i], &val_length) == NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || val_length == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetStringFromObj(objv[i], &val_length) == NULL) {
</span> Tcl_WrongNumArgs(interp, 2, objv,
"search ?key ?options? value ...?");
return TCL_ERROR;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,8 +293,7 @@ static int entry_search(Tcl_Interp* interp, int objc, Tcl_Obj* CONST objv[]) {
</span> } else {
/* this key must also have a value */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Tcl_GetStringFromObj(objv[i], &val_length) == NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || val_length == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetStringFromObj(objv[i], &val_length) == NULL) {
</span> Tcl_WrongNumArgs(interp, 2, objv,
"search ?key ?options? value ...?");
return TCL_ERROR;
</pre><pre style='margin:0'>
</pre>