No binary change. ok?
Index: cl/cl_main.c =================================================================== RCS file: /cvs/src/usr.bin/vi/cl/cl_main.c,v retrieving revision 1.27 diff -u -p -r1.27 cl_main.c --- cl/cl_main.c 7 Dec 2015 20:39:19 -0000 1.27 +++ cl/cl_main.c 7 Dec 2015 20:41:43 -0000 @@ -151,7 +151,7 @@ gs_init(char *name) name = p + 1; /* Allocate the global structure. */ - CALLOC_NOMSG(NULL, gp, 1, sizeof(GS)); + gp = calloc(1, sizeof(GS)); if (gp == NULL) perr(name, NULL); @@ -171,7 +171,7 @@ cl_init(GS *gp) int fd; /* Allocate the CL private structure. */ - CALLOC_NOMSG(NULL, clp, 1, sizeof(CL_PRIVATE)); + clp = calloc(1, sizeof(CL_PRIVATE)); if (clp == NULL) perr(gp->progname, NULL); gp->cl_private = clp; Index: common/main.c =================================================================== RCS file: /cvs/src/usr.bin/vi/common/main.c,v retrieving revision 1.31 diff -u -p -r1.31 main.c --- common/main.c 7 Dec 2015 20:39:19 -0000 1.31 +++ common/main.c 7 Dec 2015 20:41:43 -0000 @@ -360,7 +360,7 @@ editor(GS *gp, int argc, char *argv[]) size_t l; /* Cheat -- we know we have an extra argv slot. */ l = strlen(sp->frp->name) + 1; - MALLOC_NOMSG(sp, *--argv, l); + *--argv = malloc(l); if (*argv == NULL) { v_estr(gp->progname, errno, NULL); goto err; @@ -563,7 +563,7 @@ v_obsolete(char *name, char *argv[]) } else { p = argv[0]; len = strlen(argv[0]); - MALLOC_NOMSG(NULL, argv[0], len + 2); + argv[0] = malloc(len + 2); if (argv[0] == NULL) goto nomem; argv[0][0] = '-'; Index: common/mem.h =================================================================== RCS file: /cvs/src/usr.bin/vi/common/mem.h,v retrieving revision 1.7 diff -u -p -r1.7 mem.h --- common/mem.h 7 Dec 2015 20:39:19 -0000 1.7 +++ common/mem.h 7 Dec 2015 20:41:43 -0000 @@ -120,9 +120,6 @@ if (((p) = calloc((nmemb), (size))) == NULL) \ goto alloc_err; \ } -#define CALLOC_NOMSG(sp, p, nmemb, size) { \ - (p) = calloc((nmemb), (size)); \ -} #define CALLOC_RET(sp, p, nmemb, size) { \ if (((p) = calloc((nmemb), (size))) == NULL) { \ msgq((sp), M_SYSERR, NULL); \ @@ -137,9 +134,6 @@ #define MALLOC_GOTO(sp, p, size) { \ if (((p) = malloc(size)) == NULL) \ goto alloc_err; \ -} -#define MALLOC_NOMSG(sp, p, size) { \ - (p) = malloc(size); \ } #define MALLOC_RET(sp, p, size) { \ if (((p) = malloc(size)) == NULL) { \