projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is mmh-0.2
[mmh]
/
uip
/
sortm.c
diff --git
a/uip/sortm.c
b/uip/sortm.c
index
802e010
..
ae4038d
100644
(file)
--- a/
uip/sortm.c
+++ b/
uip/sortm.c
@@
-197,7
+197,7
@@
main(int argc, char **argv)
/*
** sort a list of pointers to our "messages to be sorted".
*/
/*
** sort a list of pointers to our "messages to be sorted".
*/
- dlist = (struct smsg **) mh_xmalloc((nmsgs+1) * sizeof(*dlist));
+ dlist = (struct smsg **) mh_xcalloc((size_t) (nmsgs+1), sizeof(*dlist));
for (i = 0; i < nmsgs; i++)
dlist[i] = &smsgs[i];
dlist[nmsgs] = 0;
for (i = 0; i < nmsgs; i++)
dlist[i] = &smsgs[i];
dlist[nmsgs] = 0;
@@
-222,7
+222,7
@@
main(int argc, char **argv)
*/
if (!submajor && subjsort) { /* already date sorted */
struct smsg **slist, **flist;
*/
if (!submajor && subjsort) { /* already date sorted */
struct smsg **slist, **flist;
- register struct smsg ***il, **fp, **dp;
+ struct smsg ***il, **fp, **dp;
slist = (struct smsg **)
mh_xmalloc((nmsgs+1) * sizeof(*slist));
slist = (struct smsg **)
mh_xmalloc((nmsgs+1) * sizeof(*slist));
@@
-235,7
+235,7
@@
main(int argc, char **argv)
** the collection of messages with the same subj
** given a message number.
*/
** the collection of messages with the same subj
** given a message number.
*/
- il = (struct smsg ***) calloc(mp->hghsel+1, sizeof(*il));
+ il = (struct smsg ***) mh_xcalloc(mp->hghsel+1, sizeof(*il));
if (! il)
adios(EX_OSERR, NULL, "couldn't allocate msg list");
for (i = 0; i < nmsgs; i++)
if (! il)
adios(EX_OSERR, NULL, "couldn't allocate msg list");
for (i = 0; i < nmsgs; i++)
@@
-248,7
+248,7
@@
main(int argc, char **argv)
mh_xmalloc((nmsgs+1) * sizeof(*flist));
fp = flist;
for (dp = dlist; *dp;) {
mh_xmalloc((nmsgs+1) * sizeof(*flist));
fp = flist;
for (dp = dlist; *dp;) {
- register struct smsg **s = il[(*dp++)->s_msg];
+ struct smsg **s = il[(*dp++)->s_msg];
/* see if we already did this guy */
if (! s)
/* see if we already did this guy */
if (! s)
@@
-291,11
+291,11
@@
read_hdrs(struct msgs *mp, char *datesw)
{
int msgnum;
struct tws tb;
{
int msgnum;
struct tws tb;
- register struct smsg *s;
+ struct smsg *s;
twscopy(&tb, dlocaltimenow());
twscopy(&tb, dlocaltimenow());
- smsgs = (struct smsg *) calloc((size_t) (mp->hghsel - mp->lowsel + 2),
+ smsgs = (struct smsg *) mh_xcalloc((size_t) (mp->hghsel - mp->lowsel + 2),
sizeof(*smsgs));
if (smsgs == NULL)
adios(EX_OSERR, NULL, "unable to allocate sort storage");
sizeof(*smsgs));
if (smsgs == NULL)
adios(EX_OSERR, NULL, "unable to allocate sort storage");
@@
-322,12
+322,12
@@
read_hdrs(struct msgs *mp, char *datesw)
static int
get_fields(char *datesw, int msg, struct smsg *smsg)
{
static int
get_fields(char *datesw, int msg, struct smsg *smsg)
{
- register int state;
+ int state;
int compnum;
char *msgnam, buf[BUFSIZ], nam[NAMESZ];
int compnum;
char *msgnam, buf[BUFSIZ], nam[NAMESZ];
- register struct tws *tw;
- register char *datecomp = NULL, *subjcomp = NULL;
- register FILE *in;
+ struct tws *tw;
+ char *datecomp = NULL, *subjcomp = NULL;
+ FILE *in;
if ((in = fopen(msgnam = m_name(msg), "r")) == NULL) {
admonish(msgnam, "unable to read message");
if ((in = fopen(msgnam = m_name(msg), "r")) == NULL) {
admonish(msgnam, "unable to read message");
@@
-409,8
+409,8
@@
get_fields(char *datesw, int msg, struct smsg *smsg)
** leading "re:", everything but letters & smash
** letters to lower case.
*/
** leading "re:", everything but letters & smash
** letters to lower case.
*/
- register char *cp, *cp2;
- register unsigned char c;
+ char *cp, *cp2;
+ unsigned char c;
cp = subjcomp;
cp2 = subjcomp;
cp = subjcomp;
cp2 = subjcomp;
@@
-466,7
+466,7
@@
dsort(struct smsg **a, struct smsg **b)
static int
subsort(struct smsg **a, struct smsg **b)
{
static int
subsort(struct smsg **a, struct smsg **b)
{
- register int i;
+ int i;
if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
return (i);
if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
return (i);
@@
-477,7
+477,7
@@
subsort(struct smsg **a, struct smsg **b)
static int
txtsort(struct smsg **a, struct smsg **b)
{
static int
txtsort(struct smsg **a, struct smsg **b)
{
- register int i;
+ int i;
if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
return (i);
if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
return (i);