Merge commit '9d02'

i have no idea

Conflicts:
	mssql.d

README

@@ -63,3 +63,8 @@ bmp.d   - gives .bmp read/write
 dws.d  - a draft of my D windowing system (also includes some Qt code)
 wav.d  - reading and writing WAV files
 midi.d - reading and writing MIDI files
+
+
+Authors:
+
+Thanks go to Nick Sabalusky, Trass3r, and Stanislav Blinov for input and patches.

curl.d

@@ -142,6 +142,11 @@ string curlAuth(string url, string data = null, string username = null, string p
 		if(res != 0) throw new CurlException(res);
 		res = curl_easy_setopt(curl, CURLOPT_COOKIEFILE, toStringz(cookieJar));
 		if(res != 0) throw new CurlException(res);
+	} else {
+		// just want to enable cookie parsing for location 3xx thingies.
+		// some crappy sites will give you an endless runaround if they can't
+		// place their fucking tracking cookies.
+		res = curl_easy_setopt(curl, CURLOPT_COOKIEFILE, toStringz("lol totally not here"));
 	}
 
 	res = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);

database.d

@@ -25,35 +25,19 @@ interface Database {
 		Variant[] args;
 		foreach(arg; _arguments) {
 			string a;
-			if(arg == typeid(string)) {
+			if(arg == typeid(string) || arg == typeid(immutable(string)) || arg == typeid(const(string)))
-				a = va_arg!(string)(_argptr);
+				a = va_arg!string(_argptr);
-			} else if(arg == typeid(immutable(string))) {
+			else if (arg == typeid(int) || arg == typeid(immutable(int)) || arg == typeid(const(int))) {
-				a = va_arg!(immutable(string))(_argptr);
+				int e = va_arg!int(_argptr);
-			} else if(arg == typeid(const(immutable(char)[]))) {
-				a = va_arg!(const(immutable(char)[]))(_argptr);
-			} else if (arg == typeid(int)) {
-				auto e = va_arg!(int)(_argptr);
-				a = to!string(e);
-			} else if (arg == typeid(immutable(int))) {
-				auto e = va_arg!(immutable(int))(_argptr);
-				a = to!string(e);
-			} else if (arg == typeid(const(int))) {
-				auto e = va_arg!(const(int))(_argptr);
 				a = to!string(e);
 			} else if (arg == typeid(immutable(char))) {
-				auto e = va_arg!(immutable(char))(_argptr);
+				char e = va_arg!char(_argptr);
 				a = to!string(e);
-			} else if (arg == typeid(long)) {
+			} else if (arg == typeid(long) || arg == typeid(const(long)) || arg == typeid(immutable(long))) {
-				auto e = va_arg!(long)(_argptr);
+				long e = va_arg!long(_argptr);
-				a = to!string(e);
-			} else if (arg == typeid(const(long))) {
-				auto e = va_arg!(const(long))(_argptr);
-				a = to!string(e);
-			} else if (arg == typeid(immutable(long))) {
-				auto e = va_arg!(immutable(long))(_argptr);
 				a = to!string(e);
 			} else if (arg == typeid(void*)) {
-				auto e = va_arg!(void*)(_argptr);
+				void* e = va_arg!(void*)(_argptr);
 				assert(e is null, "can only pass null pointer");
 				a = null;
 			} else assert(0, "invalid type " ~ arg.toString );

dom.d

@@ -2196,7 +2196,7 @@ class Table : Element {
 			return position;
 		}
 
-		foreach(i, rowElement; rows) {
+		foreach(int i, rowElement; rows) {
 			auto row = cast(TableRow) rowElement;
 			assert(row !is null);
 			assert(i < ret.length);
@@ -2210,8 +2210,8 @@ class Table : Element {
 				// FIXME: colspan == 0 or rowspan == 0
 				// is supposed to mean fill in the rest of
 				// the table, not skip it
-				foreach(j; 0 .. cell.colspan) {
+				foreach(int j; 0 .. cell.colspan) {
-					foreach(k; 0 .. cell.rowspan)
+					foreach(int k; 0 .. cell.rowspan)
 						// if the first row, always append.
 						insertCell(k + i, k == 0 ? -1 : position, cell);
 					position++;
@@ -2219,7 +2219,7 @@ class Table : Element {
 			}
 
 			if(ret[i].length > maxLength)
-				maxLength = ret[i].length;
+				maxLength = cast(int) ret[i].length;
 		}
 
 		// want to ensure it's rectangular

mssql.d

@@ -50,8 +50,7 @@ class MsSql : Database {
 
 		// this is passed to MsSqlResult to control
 		SQLHSTMT statement;
-		auto returned = SQLAllocHandle(SQL_HANDLE_STMT, conn,
+		auto returned = SQLAllocHandle(SQL_HANDLE_STMT, conn, &statement);
-                                &statement);
 
 		enforce(returned == SQL_SUCCESS);
 
@@ -157,6 +156,10 @@ class MsSqlResult : ResultSet {
 						if(ptr)
 							goto more;
 					}
+<<<<<<< HEAD
+=======
+				}
+>>>>>>> 9d02
 					row ~= a;
 				}
 

mysql.d

@@ -92,8 +92,12 @@ class MySqlResult : ResultSet {
 		int numFields = mysql_num_fields(result);
 		auto fields = mysql_fetch_fields(result);
 
+		if(fields is null)
+			return;
+
 		for(int i = 0; i < numFields; i++) {
-			mapping[fromCstring(fields[i].name)] = i;
+			if(fields[i].name !is null)
+				mapping[fromCstring(fields[i].name)] = i;
 		}
 	}