Changeset 7f9df7b9 in mainline for uspace/lib/posix/src/locale.c

Timestamp:

2018-01-22T22:42:57Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7a08c70

Parents:

e0f47f5

Message:

Remove unnecessary symbol renaming from libposix.

File:

• uspace/lib/posix/src/locale.c (modified) (11 diffs)

uspace/lib/posix/src/locale.c

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "internal/common.h"
 #include "posix/locale.h"
@@ -54 +51 @@
 };
 
-const struct posix_lconv C_LOCALE = {
+const struct lconv C_LOCALE = {
         .currency_symbol = (char *) "",
         .decimal_point = (char *) ".",
@@ -88 +85 @@
  * @return Original locale name on success, NULL on failure.
  */
-char *posix_setlocale(int category, const char *locale)
+char *setlocale(int category, const char *locale)
 {
         // TODO
         if (locale == NULL || *locale == '\0' ||
-            posix_strcmp(locale, "C") == 0) {
+            strcmp(locale, "C") == 0) {
                 return (char *) "C";
         }
@@ -103 +100 @@
  * @return Information about the current locale.
  */
-struct posix_lconv *posix_localeconv(void)
+struct lconv *localeconv(void)
 {
         // TODO
-        return (struct posix_lconv *) &C_LOCALE;
+        return (struct lconv *) &C_LOCALE;
 }
 
@@ -115 +112 @@
  * @return Duplicated object.
  */
-posix_locale_t posix_duplocale(posix_locale_t locobj)
+locale_t duplocale(locale_t locobj)
 {
         if (locobj == NULL) {
@@ -121 +118 @@
                 return NULL;
         }
-        posix_locale_t copy = malloc(sizeof(struct __posix_locale));
+        locale_t copy = malloc(sizeof(struct __posix_locale));
         if (copy == NULL) {
                 errno = ENOMEM;
@@ -135 +132 @@
  * @param locobj Object to free.
  */
-void posix_freelocale(posix_locale_t locobj)
+void freelocale(locale_t locobj)
 {
         if (locobj) {
@@ -150 +147 @@
  * @return The new/modified locale object.
  */
-posix_locale_t posix_newlocale(int category_mask, const char *locale,
-    posix_locale_t base)
+locale_t newlocale(int category_mask, const char *locale,
+    locale_t base)
 {
         if (locale == NULL ||
@@ -159 +156 @@
         }
         // TODO
-        posix_locale_t new = malloc(sizeof(struct __posix_locale));
+        locale_t new = malloc(sizeof(struct __posix_locale));
         if (new == NULL) {
                 errno = ENOMEM;
@@ -165 +162 @@
         }
         if (base != NULL) {
-                posix_freelocale(base);
+                freelocale(base);
         }
         return new;
@@ -176 +173 @@
  * @return The previously set locale or LC_GLOBAL_LOCALE
  */
-posix_locale_t posix_uselocale(posix_locale_t newloc)
+locale_t uselocale(locale_t newloc)
 {
         // TODO