Changeset ced1e17 for storage_xml.c
- Timestamp:
- 2008-09-07T14:34:50Z (16 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
storage_xml.c
rd4810df rced1e17 288 288 } 289 289 290 static storage_status_t xml_load_real( const char *my_nick, const char *password, irc_t *irc, xml_pass_st action )290 static storage_status_t xml_load_real( irc_t *irc, const char *my_nick, const char *password, xml_pass_st action ) 291 291 { 292 292 GMarkupParseContext *ctx; … … 295 295 GError *gerr = NULL; 296 296 int fd, st; 297 298 if( irc && irc->status & USTATUS_IDENTIFIED )299 return( 1 );300 297 301 298 xd = g_new0( struct xml_parsedata, 1 ); … … 350 347 return STORAGE_OK; 351 348 352 irc->status |= USTATUS_IDENTIFIED;353 354 349 return STORAGE_OK; 355 350 } 356 351 357 static storage_status_t xml_load( const char *my_nick, const char *password, irc_t *irc)358 { 359 return xml_load_real( my_nick, password, irc, XML_PASS_UNKNOWN );352 static storage_status_t xml_load( irc_t *irc, const char *password ) 353 { 354 return xml_load_real( irc, irc->nick, password, XML_PASS_UNKNOWN ); 360 355 } 361 356 … … 364 359 /* This is a little bit risky because we have to pass NULL for the 365 360 irc_t argument. This *should* be fine, if I didn't miss anything... */ 366 return xml_load_real( my_nick, password, NULL, XML_PASS_CHECK_ONLY );361 return xml_load_real( NULL, my_nick, password, XML_PASS_CHECK_ONLY ); 367 362 } 368 363 … … 399 394 md5_byte_t pass_md5[21]; 400 395 md5_state_t md5_state; 401 402 if( irc->password == NULL )403 {404 irc_usermsg( irc, "Please register yourself if you want to save your settings." );405 return STORAGE_OTHER_ERROR;406 }407 396 408 397 path2 = g_strdup( irc->nick );
Note: See TracChangeset
for help on using the changeset viewer.