Changeset ced1e17 for storage.h

Timestamp:

2008-09-07T14:34:50Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2bebe15

Parents:

d4810df (diff), ba3a8a5 (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:

Merging BitlBee 1.2.3 release.

File:

• storage.h (modified) (2 diffs)

storage.h

@@ -45 +45 @@
         storage_status_t (*check_pass) (const char *nick, const char *password);
 
-        storage_status_t (*load) (const char *nick, const char *password, irc_t * irc);
+        storage_status_t (*load) (irc_t *irc, const char *password);
         storage_status_t (*save) (irc_t *irc, int overwrite);
         storage_status_t (*remove) (const char *nick, const char *password);
@@ -55 +55 @@
 storage_status_t storage_check_pass (const char *nick, const char *password);
 
-storage_status_t storage_load (const char *nick, const char *password, irc_t * irc);
-storage_status_t storage_save (irc_t *irc, int overwrite);
+storage_status_t storage_load (irc_t * irc, const char *password);
+storage_status_t storage_save (irc_t *irc, char *password, int overwrite);
 storage_status_t storage_remove (const char *nick, const char *password);
 
-storage_status_t storage_rename (const char *onick, const char *nnick, const char *password);
+/* storage_status_t storage_rename (const char *onick, const char *nnick, const char *password); */
 
 void register_storage_backend(storage_t *);