comparison src/database.c @ 1645:080d479edd32

[xemacs-hg @ 2003-08-26 14:03:57 by james] Nickolay Pakoulin's patch to make g++ compile database.c without error.
author james
date Tue, 26 Aug 2003 14:04:00 +0000
parents df0effd42264
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
1644:14a7222dba6d 1645:080d479edd32
416 #else 416 #else
417 status = db->db_handle->get (db->db_handle, NULL, &keydatum, &valdatum, 0); 417 status = db->db_handle->get (db->db_handle, NULL, &keydatum, &valdatum, 0);
418 #endif /* DB_VERSION_MAJOR */ 418 #endif /* DB_VERSION_MAJOR */
419 419
420 if (!status) 420 if (!status)
421 return make_ext_string (valdatum.data, valdatum.size, 421 return make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
422 db->coding_system); 422 db->coding_system);
423 423
424 #if DB_VERSION_MAJOR == 1 424 #if DB_VERSION_MAJOR == 1
425 db->dberrno = (status == 1) ? -1 : errno; 425 db->dberrno = (status == 1) ? -1 : errno;
426 #else 426 #else
526 #endif 526 #endif
527 for (status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_FIRST); 527 for (status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_FIRST);
528 status == 0; 528 status == 0;
529 status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT)) 529 status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))
530 { 530 {
531 key = make_ext_string (keydatum.data, keydatum.size, 531 key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size,
532 db->coding_system); 532 db->coding_system);
533 val = make_ext_string (valdatum.data, valdatum.size, 533 val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
534 db->coding_system); 534 db->coding_system);
535 call2 (func, key, val); 535 call2 (func, key, val);
536 } 536 }
537 dbcp->c_close (dbcp); 537 dbcp->c_close (dbcp);
538 } 538 }