=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsprog.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- src/usr.bin/rcs/rcsprog.c 2005/12/09 07:00:43 1.52 +++ src/usr.bin/rcs/rcsprog.c 2005/12/10 20:27:46 1.53 @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.52 2005/12/09 07:00:43 joris Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.53 2005/12/10 20:27:46 joris Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau * All rights reserved. @@ -153,19 +153,13 @@ break; } - argv[argc] = strdup(cp); - if (argv[argc] == NULL) { - cvs_log(LP_ERRNO, "failed to copy argument"); - error++; - break; - } - + argv[argc] = xstrdup(cp); argc++; } if (error != 0) { for (i = 0; i < (u_int)argc; i++) - free(argv[i]); + xfree(argv[i]); argc = -1; } @@ -421,10 +415,7 @@ lkmode = RCS_LOCK_STRICT; break; case 'm': - if ((logstr = strdup(rcs_optarg)) == NULL) { - cvs_log(LP_ERRNO, "failed to copy logstring"); - exit(1); - } + logstr = xstrdup(rcs_optarg); break; case 'M': /* ignore for the moment */ @@ -551,7 +542,7 @@ } if (logstr != NULL) - free(logstr); + xfree(logstr); return (0); }