Skip to content

CRT_degreeSign code shrink #1598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CRT_degreeSign code shrink #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions CRT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ in the source distribution for its full text.
#include <errno.h>
#include <fcntl.h>
#include <langinfo.h>
#include <limits.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
Expand Down Expand Up @@ -94,21 +95,31 @@ const char* const* CRT_treeStr = CRT_treeStrAscii;

static const Settings* CRT_settings;

const char* CRT_degreeSign;
#ifdef HAVE_LIBNCURSESW
# if MB_LEN_MAX >= 3 // Minimum required to support UTF-8 BMP subset
char CRT_degreeSign[MB_LEN_MAX * 2] = "\xc2\xb0";
# else
char CRT_degreeSign[MB_LEN_MAX * 2] = "";
# endif
#else
char CRT_degreeSign[] = "";
#endif

static const char* initDegreeSign(void) {
static void initDegreeSign(void) {
#ifdef HAVE_LIBNCURSESW
# if MB_LEN_MAX >= 3
if (CRT_utf8)
return "\xc2\xb0";
return;
# endif

static char buffer[4];
// this might fail if the current locale does not support wide characters
int r = snprintf(buffer, sizeof(buffer), "%lc", 176);
if (r > 0)
return buffer;
int r = snprintf(CRT_degreeSign, sizeof(CRT_degreeSign), "%lc", 176);
if (r <= 0)
CRT_degreeSign[0] = '\0';
#endif

return "";
// No-op
return;
}

const int* CRT_colors;
Expand Down Expand Up @@ -1265,7 +1276,7 @@ IGNORE_WCASTQUAL_END

CRT_setMouse(settings->enableMouse);

CRT_degreeSign = initDegreeSign();
initDegreeSign();
}

void CRT_done(void) {
Expand Down
2 changes: 1 addition & 1 deletion CRT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void CRT_handleSIGSEGV(int signal) ATTR_NORETURN;
#define KEY_FOCUS_OUT (KEY_MAX + 'O')
#define KEY_DEL_MAC 127

extern const char* CRT_degreeSign;
extern char CRT_degreeSign[];

#ifdef HAVE_LIBNCURSESW

Expand Down
Loading