Backed out 2 changesets (bug 1131424) for continuing problems on a CLOSED TREE

Backed out changeset c43187545daa (bug 1131424)
Backed out changeset 0e7e4e9718b7 (bug 1131424)
This commit is contained in:
Steve Fink 2015-02-17 15:38:38 -08:00
Родитель 1bb3ccff83
Коммит 5cc04bad46
1 изменённых файлов: 2 добавлений и 8 удалений

Просмотреть файл

@ -6,7 +6,6 @@
#include "ctypes/Library.h"
#include "prerror.h"
#include "prlink.h"
#include "ctypes/CTypes.h"
@ -147,17 +146,12 @@ Library::Create(JSContext* cx, jsval path_, const JSCTypesCallbacks* callbacks)
PRLibrary* library = PR_LoadLibraryWithFlags(libSpec, 0);
if (!library) {
char *error = (char*) JS_malloc(cx, PR_GetErrorTextLength() + 1);
if (error)
PR_GetErrorText(error);
#ifdef XP_WIN
JS_ReportError(cx, "couldn't open library %hs: %s", pathChars, error);
JS_ReportError(cx, "couldn't open library %hs", pathChars);
#else
JS_ReportError(cx, "couldn't open library %s: %s", pathBytes, error);
JS_ReportError(cx, "couldn't open library %s", pathBytes);
JS_free(cx, pathBytes);
#endif
JS_free(cx, error);
return nullptr;
}