WIP: Change gettext stubs to fix build without gettext.

[madpilot78]

These changes are required to build audacious on FreeBSD when passing --disable-nls to configure.

• Change _() to strip const from the string.

This one is used in

audacious/src/libaudgui/infowin.cc

Line 265 in 73a881f

list = g_list_sort (list, (GCompareFunc) strcmp);

It fails due to the const qualifier

• Add a gettext() stub

This is used in

audacious/src/libaudgui/prefs-window.cc

Line 534 in 73a881f

gettext (category.name), -1);

Which does not look FreeBSD specific.

[madpilot78]

Thanks in advance for any feedback.

[jlindgren90]

Casting away const does not seem right. The code in genre_fill() should be updated instead, preferably to use a type-safe C++ construct such as Index<const char*> rather than C-style GList.

[jlindgren90]

I believe the call to gettext() in prefs-window.cc should just be replaced with _().

[madpilot78]

Casting away const does not seem right. The code in genre_fill() should be updated instead, preferably to use a type-safe C++ construct such as Index<const char*> rather than C-style GList.

I'm not very fluent in C++, so I need to study a little to do what you suggest.

For this reason I'm marking this as WIP in the while.

[madpilot78]

The code in genre_fill() should be updated instead, preferably to use a type-safe C++ construct such as Index<const char*> rather than C-style GList.

Thinking about this, first of all I can't find any reference regarding Index<>, so I'm not understanding your suggestion.

But I was thinking that using a simple #define _(String) (String) as a noop replacement for gettext does not look correct to me.

Gettext accepts a const char * and then returns a new non const char *. While that mock implementation simply returns back the const char * from the argument, which is a different interface.

Correct thing to do would be to perform an strcpy like operation (preferably using a safe replacement like strlcpy) to a newly allocated char *. This would imitate what gettext is doing.

Not sure where and when such memory should be freed though.

[madpilot78]

I also discovered this from getext man page:

BUGS
       The return type ought to be const char *, but is char * to avoid
       warnings in C code predating ANSI C.

Which would mean that simply stripping the const is not really that much different from what gettext is actually doing.

[jlindgren90]

Thinking about this, first of all I can't find any reference regarding Index<>, so I'm not understanding your suggestion.

Index is a class similar to std::vector, see libaudcore/index.h.

Correct thing to do would be to perform an strcpy like operation (preferably using a safe replacement like strlcpy) to a newly allocated char *. This would imitate what gettext is doing.

As mentioned in the BUGS section you found, gettext() ought to return const char *. If we are modifying the returned string anywhere in our code, that is a bug. So calling strdup() or such is unnecessary. If anything, I would make our _() macro produce a const char * in all cases for consistency.

I've implemented a fix in e6e9016. Thanks for bringing the issue to our attention!