projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
hcache.c
diff --git
a/hcache.c
b/hcache.c
index
f6bcbf8
..
f6e0d8d
100644
(file)
--- a/
hcache.c
+++ b/
hcache.c
@@
-125,7
+125,7
@@
static unsigned char *dump_char (char *c, unsigned char *d, int *off)
return d;
}
return d;
}
- size =
safe
_strlen (c) + 1;
+ size =
mutt
_strlen (c) + 1;
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
d = dump_int (size, d, off);
lazy_realloc (&d, *off + size);
memcpy (d + *off, c, size);
@@
-447,35
+447,35
@@
static int generate_crc32 ()
crc = crc32 (crc, (unsigned char const *)
"sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
crc = crc32 (crc, (unsigned char const *)
"sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613",
-
safe
_strlen
+
mutt
_strlen
("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
#if HAVE_LANGINFO_CODESET
("sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
#if HAVE_LANGINFO_CODESET
- crc = crc32 (crc, (unsigned char const *) Charset,
safe
_strlen (Charset));
+ crc = crc32 (crc, (unsigned char const *) Charset,
mutt
_strlen (Charset));
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
crc =
crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
-
safe
_strlen ("HAVE_LANGINFO_CODESET"));
+
mutt
_strlen ("HAVE_LANGINFO_CODESET"));
#endif
#ifdef USE_POP
crc =
#endif
#ifdef USE_POP
crc =
- crc32 (crc, (unsigned char const *) "USE_POP",
safe
_strlen ("USE_POP"));
+ crc32 (crc, (unsigned char const *) "USE_POP",
mutt
_strlen ("USE_POP"));
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
#endif
#ifdef MIXMASTER
crc =
crc32 (crc, (unsigned char const *) "MIXMASTER",
-
safe
_strlen ("MIXMASTER"));
+
mutt
_strlen ("MIXMASTER"));
#endif
#ifdef USE_IMAP
crc =
#endif
#ifdef USE_IMAP
crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP",
safe
_strlen ("USE_IMAP"));
+ crc32 (crc, (unsigned char const *) "USE_IMAP",
mutt
_strlen ("USE_IMAP"));
#endif
#ifdef USE_NNTP
crc =
#endif
#ifdef USE_NNTP
crc =
- crc32 (crc, (unsigned char const *) "USE_NNTP",
safe
_strlen ("USE_NNTP"));
+ crc32 (crc, (unsigned char const *) "USE_NNTP",
mutt
_strlen ("USE_NNTP"));
#endif
return crc;
}
#endif
return crc;
}
@@
-514,7
+514,7
@@
static const char *mutt_hcache_per_folder (const char *path,
}
MD5Init (&md5);
}
MD5Init (&md5);
- MD5Update (&md5, (unsigned char *) folder,
safe
_strlen (folder));
+ MD5Update (&md5, (unsigned char *) folder,
mutt
_strlen (folder));
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
MD5Final (md5sum, &md5);
ret = snprintf (mutt_hcache_per_folder_path, _POSIX_PATH_MAX,
@@
-785,7
+785,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
}
strncpy (path, h->folder, sizeof (path));
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) -
safe
_strlen (path));
+ strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-793,7
+793,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
data = gdbm_fetch (h->db, key);
if (!crc32_matches (data.dptr, h->crc)) {
data = gdbm_fetch (h->db, key);
if (!crc32_matches (data.dptr, h->crc)) {
-
free (
data.dptr);
+
FREE(&
data.dptr);
return NULL;
}
return NULL;
}
@@
-815,7
+815,7
@@
mutt_hcache_store (void *db, const char *filename, HEADER * header,
}
strncpy (path, h->folder, sizeof (path));
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) -
safe
_strlen (path));
+ strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-842,7
+842,7
@@
mutt_hcache_delete (void *db, const char *filename,
}
strncpy (path, h->folder, sizeof (path));
}
strncpy (path, h->folder, sizeof (path));
- strncat (path, filename, sizeof (path) -
safe
_strlen (path));
+ strncat (path, filename, sizeof (path) -
mutt
_strlen (path));
key.dptr = path;
key.dsize = keylen (path);
key.dptr = path;
key.dsize = keylen (path);
@@
-907,7
+907,7
@@
void *mutt_hcache_open (const char *path, const char *folder)
}
ret =
}
ret =
-
h->env->open
(h->env, NULL, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0600);
+
(h->env->open)
(h->env, NULL, DB_INIT_MPOOL | DB_CREATE | DB_PRIVATE, 0600);
if (!ret) {
ret = db_create (&h->db, h->env, 0);
if (ret) {
if (!ret) {
ret = db_create (&h->db, h->env, 0);
if (ret) {
@@
-924,7
+924,7
@@
void *mutt_hcache_open (const char *path, const char *folder)
h->db->set_pagesize (h->db, pagesize);
}
h->db->set_pagesize (h->db, pagesize);
}
- ret =
h->db->open
(h->db, NULL, path, folder, DB_BTREE, createflags, 0600);
+ ret =
(h->db->open)
(h->db, NULL, path, folder, DB_BTREE, createflags, 0600);
if (ret) {
h->db->close (h->db, 0);
h->env->close (h->env, 0);
if (ret) {
h->db->close (h->db, 0);
h->env->close (h->env, 0);
@@
-940,7
+940,6
@@
void *mutt_hcache_open (const char *path, const char *folder)
void mutt_hcache_close (void *db)
{
struct header_cache *h = db;
void mutt_hcache_close (void *db)
{
struct header_cache *h = db;
- int ret;
if (!h) {
return;
if (!h) {
return;
@@
-973,7
+972,7
@@
void *mutt_hcache_fetch (void *db, const char *filename,
h->db->get (h->db, NULL, &key, &data, 0);
if (!crc32_matches (data.data, h->crc)) {
h->db->get (h->db, NULL, &key, &data, 0);
if (!crc32_matches (data.data, h->crc)) {
-
free (
data.data);
+
FREE(&
data.data);
return NULL;
}
return NULL;
}