=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/admin.c,v retrieving revision 1.12 retrieving revision 1.13 diff -c -r1.12 -r1.13 *** src/usr.bin/cvs/admin.c 2005/04/16 19:05:02 1.12 --- src/usr.bin/cvs/admin.c 2005/04/18 21:02:49 1.13 *************** *** 1,4 **** ! /* $OpenBSD: admin.c,v 1.12 2005/04/16 19:05:02 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * Copyright (c) 2005 Joris Vink --- 1,4 ---- ! /* $OpenBSD: admin.c,v 1.13 2005/04/18 21:02:49 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * Copyright (c) 2005 Joris Vink *************** *** 298,304 **** int ret, l; char *repo, fpath[MAXPATHLEN], rcspath[MAXPATHLEN]; RCSFILE *rf; - struct cvs_ent *entp; struct cvsroot *root; ret = 0; --- 298,303 ---- *************** *** 319,329 **** } cvs_file_getpath(cfp, fpath, sizeof(fpath)); - entp = cvs_ent_getent(fpath); if (root->cr_method != CVS_METHOD_LOCAL) { ! if ((entp != NULL) && (cvs_sendentry(root, entp) < 0)) { ! cvs_ent_free(entp); return (CVS_EX_PROTO); } --- 318,326 ---- } cvs_file_getpath(cfp, fpath, sizeof(fpath)); if (root->cr_method != CVS_METHOD_LOCAL) { ! if (cvs_sendentry(root, cfp) < 0) { return (CVS_EX_PROTO); } *************** *** 355,376 **** if (l == -1 || l >= (int)sizeof(rcspath)) { errno = ENAMETOOLONG; cvs_log(LP_ERRNO, "%s", rcspath); - - cvs_ent_free(entp); return (-1); } rf = rcs_open(rcspath, RCS_READ); if (rf == NULL) { - if (entp != NULL) - cvs_ent_free(entp); return (CVS_EX_DATA); } rcs_close(rf); } - if (entp != NULL) - cvs_ent_free(entp); return (ret); } --- 352,367 ----