Changeset 537d9b9 for storage.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• storage.c (modified) (5 diffs)

storage.c

@@ -29 +29 @@
 #include "bitlbee.h"
 
-extern storage_t storage_text;
 extern storage_t storage_xml;
 
@@ -92 +91 @@
 }
 
-storage_status_t storage_check_pass(const char *nick, const char *password)
+storage_status_t storage_check_pass(irc_t *irc, const char *nick, const char *password)
 {
         GList *gl;
@@ -102 +101 @@
                 storage_status_t status;
 
-                status = st->check_pass(nick, password);
+                status = st->check_pass(irc, nick, password);
                 if (status != STORAGE_NO_SUCH_USER) {
                         return status;
@@ -176 +175 @@
 }
 
-storage_status_t storage_remove(const char *nick, const char *password)
+storage_status_t storage_remove(const char *nick)
 {
         GList *gl;
@@ -190 +189 @@
                 storage_status_t status;
 
-                status = st->remove(nick, password);
+                status = st->remove(nick);
                 ok |= status == STORAGE_OK;
                 if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK) {