Merge lp:~paul-mccullagh/drizzle/longjmp-clobbered-fix-2 into lp:~drizzle-trunk/drizzle/development

[Paul McCullagh]

This is a better fix for the error:

pbxt/src/table_xt.cc:580: warning: variable 'edx' might be clobbered by 'longjmp' or 'vfork'

=== modified file 'plugin/pbxt/src/table_xt.cc'
--- plugin/pbxt/src/table_xt.cc	2010-04-16 23:05:59 +0000
+++ plugin/pbxt/src/table_xt.cc	2010-04-26 17:17:16 +0000
@@ -683,25 +683,17 @@
 	 * Previously we only caclulated statistics when a handler was opened
 	 * and the underlying table was also opened.
 	 */
-	/* This (hack) fixes: warning: variable 'edx' might be clobbered by 'longjmp' or 'vfork' */
-	u_int save_edx;
+	XTTableHPtr tab;
 
 	xt_enum_tables_init(&edx);
 	while ((te_ptr = xt_enum_tables_next(self, db, &edx))) {
-		save_edx = edx;
-
 		xt_strcpy(PATH_MAX, pbuf, te_ptr->te_tab_path->tp_path);
 		xt_add_dir_char(PATH_MAX, pbuf);
 		xt_strcat(PATH_MAX, pbuf, te_ptr->te_tab_name);
-		try_(a) {
-			edx = 0;
-			xt_heap_release(self, xt_use_table_no_lock(self, db, (XTPathStrPtr)pbuf, FALSE, FALSE, NULL));
-		} catch_(a) {
-			edx = 0;
-			/* ignore errors */
+		if ((tab = xt_use_table_no_lock_ns(db, (XTPathStrPtr) pbuf, FALSE, FALSE, NULL)))
+			xt_heap_release_ns(tab);
+		else
 			xt_log_and_clear_warning(self);
-		} cont_(a);
-		edx = save_edx;
 	}
 
 	popr_(); // Discard xt_tab_exit_db(db)
@@ -1472,7 +1464,6 @@
 	return_(XT_TAB_OK);
 }
 
-
 /*
  * Get a reference to a table in the current database. The table reference is valid,
  * as long as the thread is using the database!!!
@@ -1514,6 +1505,21 @@
 	return tab;
 }
 
+xtPublic XTTableHPtr xt_use_table_no_lock_ns(struct XTDatabase *db, XTPathStrPtr name, xtBool no_load, xtBool missing_ok, XTDictionaryPtr dic)
+{
+	XTTableHPtr	tab;
+	XTThreadPtr	self = xt_get_self();
+
+	try_(a) {
+		tab = xt_use_table_no_lock(self, db, name, no_load, missing_ok, dic);
+	}
+	catch_(a) {
+		tab = NULL;
+	}
+	cont_(a);
+	return tab;
+}
+
 static void tab_close_table(XTOpenTablePtr ot)
 {
 	xt_ind_free_reserved(ot);
@@ -2954,7 +2960,6 @@
 	}
 	cont_(a);
 	return tab;
-
 }
 
 /* The fixed part of the record is already in the row buffer.

=== modified file 'plugin/pbxt/src/table_xt.h'
--- plugin/pbxt/src/table_xt.h	2010-04-08 16:11:29 +0000
+++ plugin/pbxt/src/table_xt.h	2010-04-26 17:17:16 +0000
@@ -589,6 +589,7 @@
 xtBool				xt_flush_record_row(XTOpenTablePtr ot, off_t *bytes_flushed, xtBool have_table_loc);
 void				xt_flush_table(struct XTThread *self, XTOpenTablePtr ot);
 XTTableHPtr			xt_use_table_no_lock(XTThreadPtr self, struct XTDatabase *db, XTPathStrPtr name, xtBool no_load, xtBool missing_ok, XTDictionaryPtr dic);
+XTTableHPtr			xt_use_table_no_lock_ns(struct XTDatabase *db, XTPathStrPtr name, xtBool no_load, xtBool missing_ok, XTDictionaryPtr dic);
 XTTableHPtr			xt_use_table_by_id(XTThreadPtr self, struct XTDatabase *db, xtTableID tab_id, int *result);
 XTTableHPtr			xt_use_table_by_id_ns(struct XTDatabase *db, xtTableID tab_id);
 XTOpenTablePtr		xt_open_table(XTTableHPtr tab);