2 files changed, 17 insertions, 11 deletions

diff --git a/icclient/admin.h b/icclient/admin.h
index faff559..fa38676 100644
--- a/icclient/admin.h
+++ b/icclient/admin.h
@@ -1,15 +1,21 @@
 #ifndef ICCLIENT_ADMIN_H
 #define ICCLIENT_ADMIN_H
 
+struct icclient_admin {
+	char *name;
+	char *username;
+	bool super;
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-	void icclient_admin_login(size_t (*handler)(void *, size_t, size_t, void *),
-			struct icclient_member *member, const char *username,
+	struct icclient_admin *icclient_admin_login(const char *username,
 			const char *password, const char *successpage,
-			const char *nextpage, const char *failpage);
-	void icclient_admin_logout();
+			const char *nextpage, const char *failpage,
+			size_t (*handler)(void *, size_t, size_t, void *));
+	void icclient_admin_logout(struct icclient_admin *admin);
 
 #ifdef __cplusplus
 }
diff --git a/icclient/member.h b/icclient/member.h
index a91c5d6..d68f814 100644
--- a/icclient/member.h
+++ b/icclient/member.h
@@ -55,21 +55,21 @@ struct icclient_member {
 extern "C" {
 #endif
 
-	void icclient_member_newaccount(size_t (*handler)(void *, size_t, size_t, void *),
-			struct icclient_member *member, const char *username,
+	struct icclient_member *icclient_member_newaccount(const char *username,
 			const char *password, const char *verify, const char *successpage,
-			const char *nextpage, const char *failpage);
-	void icclient_member_login(size_t (*handler)(void *, size_t, size_t, void *),
-			struct icclient_member *member, const char *username,
+			const char *nextpage, const char *failpage,
+			size_t (*handler)(void *, size_t, size_t, void *));
+	struct icclient_member *icclient_member_login(const char *username,
 			const char *password, const char *successpage,
-			const char *nextpage, const char *failpage);
+			const char *nextpage, const char *failpage,
+			size_t (*handler)(void *, size_t, size_t, void *));
 	void icclient_member_account(const char *fname, const char *lname,
 			const char *address1, const char *address2, const char *city,
 			const char *state, const char *zip, const char *email,
 			const char *phone_day);
 	void icclient_member_changepassword(const char *password_old, const char *password,
 			const char *verify);
-	void icclient_member_logout();
+	void icclient_member_logout(struct icclient_member *member);
 
 #ifdef __cplusplus
 }