Changeset 7f9df7b9 in mainline for uspace/lib/posix/src/pwd.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/pwd.c (modified) (13 diffs)

uspace/lib/posix/src/pwd.c

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "libc/stdbool.h"
 #include "posix/pwd.h"
@@ -45 +42 @@
 
 /* dummy user account */
-static const struct posix_passwd dummy_pwd = {
+static const struct passwd dummy_pwd = {
         .pw_name = (char *) "user",
         .pw_uid = 0,
@@ -62 +59 @@
  *     doesn't have user accounts, this always returns the same made-up entry.
  */
-struct posix_passwd *posix_getpwent(void)
+struct passwd *getpwent(void)
 {
         if (entry_read) {
@@ -69 +66 @@
 
         entry_read = true;
-        return (struct posix_passwd *) &dummy_pwd;
+        return (struct passwd *) &dummy_pwd;
 }
 
@@ -75 +72 @@
  * Rewind the user list.
  */
-void posix_setpwent(void)
+void setpwent(void)
 {
         entry_read = false;
@@ -83 +80 @@
  * Ends enumerating and releases all resources. (Noop)
  */
-void posix_endpwent(void)
+void endpwent(void)
 {
         /* noop */
@@ -94 +91 @@
  * @return Either found entry or NULL if no such entry exists.
  */
-struct posix_passwd *posix_getpwnam(const char *name)
+struct passwd *getpwnam(const char *name)
 {
         assert(name != NULL);
 
-        if (posix_strcmp(name, "user") != 0) {
+        if (strcmp(name, "user") != 0) {
                 return NULL;
         }
 
-        return (struct posix_passwd *) &dummy_pwd;
+        return (struct passwd *) &dummy_pwd;
 }
 
@@ -116 +113 @@
  *     non-zero error number if error occured.
  */
-int posix_getpwnam_r(const char *name, struct posix_passwd *pwd,
-    char *buffer, size_t bufsize, struct posix_passwd **result)
+int getpwnam_r(const char *name, struct passwd *pwd,
+    char *buffer, size_t bufsize, struct passwd **result)
 {
         assert(name != NULL);
@@ -124 +121 @@
         assert(result != NULL);
         
-        if (posix_strcmp(name, "user") != 0) {
+        if (strcmp(name, "user") != 0) {
                 *result = NULL;
                 return 0;
         }
         
-        return posix_getpwuid_r(0, pwd, buffer, bufsize, result);
+        return getpwuid_r(0, pwd, buffer, bufsize, result);
 }
 
@@ -138 +135 @@
  * @return Either found entry or NULL if no such entry exists.
  */
-struct posix_passwd *posix_getpwuid(posix_uid_t uid)
+struct passwd *getpwuid(uid_t uid)
 {
         if (uid != 0) {
@@ -144 +141 @@
         }
 
-        return (struct posix_passwd *) &dummy_pwd;
+        return (struct passwd *) &dummy_pwd;
 }
 
@@ -158 +155 @@
  *     non-zero error number if error occured.
  */
-int posix_getpwuid_r(posix_uid_t uid, struct posix_passwd *pwd,
-    char *buffer, size_t bufsize, struct posix_passwd **result)
+int getpwuid_r(uid_t uid, struct passwd *pwd,
+    char *buffer, size_t bufsize, struct passwd **result)
 {
         assert(pwd != NULL);
@@ -184 +181 @@
         pwd->pw_dir = (char *) bf + 5;
         pwd->pw_shell = (char *) bf + 7;
-        *result = (struct posix_passwd *) pwd;
+        *result = (struct passwd *) pwd;
 
         return 0;