[[ UninitialisedVars ]] Remove commented-out code, fix wrong success check in MCHandleLibUrlSetSSLVerification

livecodesebastien · livecodesebastien · commit e74526563069 · 2015-10-07T14:37:46.000+01:00
diff --git a/engine/src/mblhandlers.cpp b/engine/src/mblhandlers.cpp
@@ -6685,7 +6685,7 @@ Exec_stat MCHandleLibUrlSetSSLVerification(void *context, MCParameter *p_paramet
     if (t_success)
         MCMiscExecLibUrlSetSSLVerification(ctxt, t_enabled);
     
-    if (!ctxt . HasError() & t_success)
+    if (t_success && !ctxt . HasError())
         return ES_NORMAL;
 	
 	return ES_ERROR;
diff --git a/engine/src/mbliphonemail.mm b/engine/src/mbliphonemail.mm
@@ -470,7 +470,7 @@ static void compose_mail_prewait(void *p_context)
 				t_data = [[NSData alloc] initWithBytes: nil length: 0];
 			else if (ctxt -> attachments[i] . data != nil)
 				t_data = [NSData dataWithMCDataRef: ctxt -> attachments[i] . data];
-			else // ctxt -> attachments[i] . file != nil
+			else
 			{
                 MCAssert(ctxt -> attachments[i] . file != nil);
 				MCAutoStringRef t_resolved_path;
diff --git a/revbrowser/src/revbrowser.cpp b/revbrowser/src/revbrowser.cpp
@@ -1812,7 +1812,7 @@ void XBrowserSetProp(char *args[], int nargs, char **retstring, Bool *pass, Bool
 			return;
 		}
 	}
-	else // nargs == 2
+	else
 	{
         MCAssert(nargs == 2);
 		t_browser = s_browsers . GetActiveInstance();

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ static void compose_mail_prewait(void *p_context)`
`470`	`470`	`t_data = [[NSData alloc] initWithBytes: nil length: 0];`
`471`	`471`	`else if (ctxt -> attachments[i] . data != nil)`
`472`	`472`	`t_data = [NSData dataWithMCDataRef: ctxt -> attachments[i] . data];`
`473`		`- else // ctxt -> attachments[i] . file != nil`
	`473`	`+ else`
`474`	`474`	`{`
`475`	`475`	`MCAssert(ctxt -> attachments[i] . file != nil);`
`476`	`476`	`MCAutoStringRef t_resolved_path;`
Original file line number	Diff line number	Diff line change
`@@ -1812,7 +1812,7 @@ void XBrowserSetProp(char args[], int nargs, char retstring, Bool pass, Bool`
`1812`	`1812`	`return;`
`1813`	`1813`	`}`
`1814`	`1814`	`}`
`1815`		`- else // nargs == 2`
	`1815`	`+ else`
`1816`	`1816`	`{`
`1817`	`1817`	`MCAssert(nargs == 2);`
`1818`	`1818`	`t_browser = s_browsers . GetActiveInstance();`