1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-05 20:26:46 +02:00

Revert commit 312d0c3 (localization/gettext)

There were serious problems with branch merging that need to be resolved first
This commit is contained in:
Jfreegman
2015-07-04 01:19:16 -04:00
parent 444d8e7a74
commit 035420e5c7
37 changed files with 441 additions and 5552 deletions

View File

@ -28,12 +28,6 @@
#include <dirent.h>
#include <sys/stat.h>
#ifdef NO_GETTEXT
#define gettext(A) (A)
#else
#include <libintl.h>
#endif
#include "toxic.h"
#include "windows.h"
#include "misc_tools.h"
@ -237,7 +231,7 @@ size_t get_file_name(char *namebuf, size_t bufsize, const char *pathname)
char *path = strdup(pathname);
if (path == NULL)
exit_toxic_err(gettext("failed in get_file_name"), FATALERR_MEMORY);
exit_toxic_err("failed in get_file_name", FATALERR_MEMORY);
while (len >= 0 && pathname[len] == '/')
path[len--] = '\0';
@ -245,7 +239,7 @@ size_t get_file_name(char *namebuf, size_t bufsize, const char *pathname)
char *finalname = strdup(path);
if (finalname == NULL)
exit_toxic_err(gettext("failed in get_file_name"), FATALERR_MEMORY);
exit_toxic_err("failed in get_file_name", FATALERR_MEMORY);
const char *basenm = strrchr(path, '/');