Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New compiler, new warnings about problems that don't really exist.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1690 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2008-07-10 21:11:28 +00:00
parent a8b39c4c9a
commit 717e72ffae
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/equipment.plist
View File

@ -184,6 +184,8 @@
<dict>
<key>available_to_all</key>
<true/>
<key>requires_free_passenger_berth</key>
<true/>
</dict>
</array>
<array><!-- Missile Removal -->

22
src/Core/Scripting/OOJavaScriptEngine.m
View File

@ -659,23 +659,23 @@ BOOL JSDefineNSProperty(JSContext *context, JSObject *object, NSString *name, js
static JSObject *JSArrayFromNSArray(JSContext *context, NSArray *array)
{
volatile JSObject *result = NULL;
volatile unsigned i;
JSObject *result = NULL;
unsigned i;
unsigned count;
jsval value;
BOOL OK = YES;
if (array == nil) return NULL;
result = JS_NewArrayObject(context, 0, NULL);
if (result == NULL) return NULL;
NS_DURING
result = JS_NewArrayObject(context, 0, NULL);
if (result == NULL) return NULL;
count = [array count];
for (i = 0; i != count; ++i)
{
value = [[array objectAtIndex:i] javaScriptValueInContext:context];
OK = JS_SetElement(context, (JSObject *)result, i, &value);
OK = JS_SetElement(context, result, i, &value);
if (!OK) return NULL;
}
NS_HANDLER
@ -718,7 +718,7 @@ static BOOL JSNewNSArrayValue(JSContext *context, NSArray *array, jsval *value)
*/
static JSObject *JSObjectFromNSDictionary(JSContext *context, NSDictionary *dictionary)
{
volatile JSObject *result = NULL;
JSObject *result = NULL;
BOOL OK = YES;
NSEnumerator *keyEnum = nil;
id key = nil;
@ -727,10 +727,10 @@ static JSObject *JSObjectFromNSDictionary(JSContext *context, NSDictionary *dict
if (dictionary == nil) return NULL;
result = JS_NewObject(context, NULL, NULL, NULL); // create object of class Object
if (result == NULL) return NULL;
NS_DURING
result = JS_NewObject(context, NULL, NULL, NULL); // create object of class Object
if (result == NULL) return NULL;
for (keyEnum = [dictionary keyEnumerator]; (key = [keyEnum nextObject]); )
{
if ([key isKindOfClass:[NSString class]] && [key length] != 0)
@ -738,7 +738,7 @@ static JSObject *JSObjectFromNSDictionary(JSContext *context, NSDictionary *dict
value = [[dictionary objectForKey:key] javaScriptValueInContext:context];
if (value != JSVAL_VOID)
{
OK = JSSetNSProperty(context, (JSObject *)result, key, &value);
OK = JSSetNSProperty(context, result, key, &value);
if (!OK) return NULL;
}
}