Use a more natural way of returning the "item" pointer

Author: Eric Haszlakiewicz <[email protected]>
djeraseit · May 13, 2016 · feb2d82 · feb2d82
1 parent 3da2d67
commit feb2d82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/libpam/examples/demo.c b/libpam/examples/demo.c
@@ -93,17 +93,17 @@ int pam_get_item(const pam_handle_t *pamh, int item_type,
   switch (item_type) {
     case PAM_SERVICE: {
       static const char service[] = "google_authenticator_demo";
-      memcpy(item, &service, sizeof(&service));
+      *item = service;
       return PAM_SUCCESS;
     }
     case PAM_USER: {
       char *user = getenv("USER");
-      memcpy(item, &user, sizeof(&user));
+      *item = user;
       return PAM_SUCCESS;
     }
     case PAM_CONV: {
       static struct pam_conv conv = { .conv = conversation }, *p_conv = &conv;
-      memcpy(item, &p_conv, sizeof(p_conv));
+      *item = p_conv;
       return PAM_SUCCESS;
     }
     default:

diff --git a/libpam/tests/pam_google_authenticator_unittest.c b/libpam/tests/pam_google_authenticator_unittest.c
@@ -80,17 +80,17 @@ int pam_get_item(const pam_handle_t *pamh, int item_type,
   switch (item_type) {
     case PAM_SERVICE: {
       static const char *service = "google_authenticator_unittest";
-      memcpy(item, &service, sizeof(&service));
+      *item = service;
       return PAM_SUCCESS;
     }
     case PAM_USER: {
       char *user = getenv("USER");
-      memcpy(item, &user, sizeof(&user));
+      *item = user;
       return PAM_SUCCESS;
     }
     case PAM_CONV: {
       static struct pam_conv conv = { .conv = conversation }, *p_conv = &conv;
-      memcpy(item, &p_conv, sizeof(p_conv));
+      *item = p_conv;
       return PAM_SUCCESS;
     }
     case PAM_AUTHTOK: {