projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change configure.in to emit a warning when an argument is given to
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
5097119
..
8247ff0
100644
(file)
--- a/
uip/conflict.c
+++ b/
uip/conflict.c
@@
-139,7
+139,8
@@
main (int argc, char **argv)
#endif /* UCI */
maildrops ();
#endif /* UCI */
maildrops ();
- return done (0);
+ done (0);
+ return 1;
}
}
@@
-205,9
+206,8
@@
grp_names (void)
if (i >= numgroups) {
if (numgroups >= maxgroups) {
maxgroups += NGRPS;
if (i >= numgroups) {
if (numgroups >= maxgroups) {
maxgroups += NGRPS;
- if (!(grps = (char **) realloc(grps,
- (size_t) (maxgroups * sizeof(*grps)))))
- adios (NULL, "unable to reallocate group name storage");
+ grps = (char **) mh_xrealloc(grps,
+ (size_t) (maxgroups * sizeof(*grps)));
}
grps[numgroups++] = getcpy (gr->gr_name);
}
}
grps[numgroups++] = getcpy (gr->gr_name);
}