From: Andre Noll <maan@systemlinux.org>
Date: Sun, 19 Apr 2009 21:20:51 +0000 (+0200)
Subject: Merge commit 'athcx/master'
X-Git-Tag: v0.1.0~38
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=e2359e0a52bcb16ff760c114b089b96049b368c8;hp=-c;p=osl.git

Merge commit 'athcx/master'
---

e2359e0a52bcb16ff760c114b089b96049b368c8
diff --combined osl.c
index 1179307,16b3af5..50f6398
--- a/osl.c
+++ b/osl.c
@@@ -194,6 -194,7 +194,6 @@@ static int init_column_descriptions(str
  	int i, j, ret;
  	const struct osl_column_description *cd;
  
 -	ret = -E_OSL_BAD_TABLE_DESC;
  	ret = verify_name(t->desc->name);
  	if (ret < 0)
  		goto err;
@@@ -765,6 -766,10 +765,10 @@@ int get_mapped_object(const struct osl_
  	return 1;
  }
  
+ /*
+  * It's OK to call this with result = rb_node = NULL.  If result is not NULL,
+  * and rb key was not found, result points to the parent node.
+  */
  static int search_rbtree(const struct osl_object *obj,
  		const struct osl_table *t, unsigned col_num,
  		struct rb_node **result, struct rb_node ***rb_link)