/*
* Copyright (C) 2012, 2013 Eric Biggers
*
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
*
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
}
WIMLIBAPI int
-wimlib_set_error_file_by_name(const char *path)
+wimlib_set_error_file_by_name(const tchar *path)
{
#ifdef ENABLE_ERROR_MESSAGES
FILE *fp;
+#ifdef __WIN32__
+ fp = win32_open_logfile(path);
+#else
fp = fopen(path, "a");
+#endif
if (!fp)
return WIMLIB_ERR_OPEN;
wimlib_set_error_file(fp);
[WIMLIB_ERR_INSUFFICIENT_PRIVILEGES]
= T("The user does not have sufficient privileges"),
[WIMLIB_ERR_INTEGRITY]
- = T("The WIM failed an integrity check"),
+ = T("The WIM file is corrupted (failed integrity check)"),
[WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
= T("The capture configuration string was invalid"),
[WIMLIB_ERR_INVALID_CHUNK_SIZE]
- = T("The WIM chunk size was invalid"),
+ = T("The compression chunk size was unrecognized"),
[WIMLIB_ERR_INVALID_COMPRESSION_TYPE]
- = T("The WIM compression type was invalid"),
+ = T("The compression type was unrecognized"),
[WIMLIB_ERR_INVALID_HEADER]
= T("The WIM header was invalid"),
[WIMLIB_ERR_INVALID_IMAGE]
= T("There is not a WIM image mounted on the directory"),
[WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT]
= T("The current user does not have permission to unmount the WIM image"),
+ [WIMLIB_ERR_FVE_LOCKED_VOLUME]
+ = T("The volume must be unlocked before it can be used"),
};
/* API function documented in wimlib.h */
WIMLIBAPI const tchar *
-wimlib_get_error_string(enum wimlib_error_code code)
+wimlib_get_error_string(enum wimlib_error_code _code)
{
- if ((int)code < 0 || code >= ARRAY_LEN(error_strings))
- return NULL;
- else
- return error_strings[code];
+ unsigned int code = (unsigned int)_code;
+
+ if (code >= ARRAY_LEN(error_strings) || error_strings[code] == NULL)
+ return T("Unknown error");
+
+ return error_strings[code];
}
-static void *(*wimlib_malloc_func) (size_t) = malloc;
-static void (*wimlib_free_func) (void *) = free;
+static void *(*wimlib_malloc_func) (size_t) = malloc;
+static void (*wimlib_free_func) (void *) = free;
static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
void *
size++;
goto retry;
}
- ERROR("memory exhausted");
}
return ptr;
}
{
if (size == 0)
size = 1;
- ptr = (*wimlib_realloc_func)(ptr, size);
- if (ptr == NULL)
- ERROR("memory exhausted");
- return ptr;
+ return (*wimlib_realloc_func)(ptr, size);
}
void *