=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/ci.c,v retrieving revision 1.58 retrieving revision 1.59 diff -c -r1.58 -r1.59 *** src/usr.bin/rcs/ci.c 2005/11/16 19:06:41 1.58 --- src/usr.bin/rcs/ci.c 2005/11/16 19:23:46 1.59 *************** *** 1,4 **** ! /* $OpenBSD: ci.c,v 1.58 2005/11/16 19:06:41 niallo Exp $ */ /* * Copyright (c) 2005 Niall O'Higgins * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: ci.c,v 1.59 2005/11/16 19:23:46 niallo Exp $ */ /* * Copyright (c) 2005 Niall O'Higgins * All rights reserved. *************** *** 400,405 **** --- 400,411 ---- return (status); } + /* + * checkin_diff_file() + * + * Generate the diff between the working file and a revision. + * Returns pointer to a char array on success, NULL on failure. + */ static char * checkin_diff_file(struct checkin_params *pb) { *************** *** 458,464 **** --- 464,473 ---- } /* + * checkin_getlogmsg() + * * Get log message from user interactively. + * Returns pointer to a char array on success, NULL on failure. */ static char * checkin_getlogmsg(RCSNUM *rev, RCSNUM *rev2) *************** *** 489,495 **** * checkin_getdesc() * * Get file description interactively. ! * Returns NULL on failure. */ static char * checkin_getdesc() --- 498,504 ---- * checkin_getdesc() * * Get file description interactively. ! * Returns pointer to a char array on success, NULL on failure. */ static char * checkin_getdesc() *************** *** 503,509 **** /* * checkin_getinput() * ! * Get some input from the user. */ static char * checkin_getinput(const char *prompt) --- 512,519 ---- /* * checkin_getinput() * ! * Get some input from the user, in RCS style, prompting with message . ! * Returns pointer to a char array on success, NULL on failure. */ static char * checkin_getinput(const char *prompt) *************** *** 535,540 **** --- 545,551 ---- * checkin_init() * * Does an initial check in, just enough to create the new ,v file + * XXX not full implemented yet. */ static void checkin_init(struct checkin_params *pb) *************** *** 571,576 **** --- 582,593 ---- } } + /* + * checkin_attach_symbol() + * + * Attempt to attach the specified symbol to the revision. + * On success, return 0. On error return -1. + */ static int checkin_attach_symbol(struct checkin_params *pb) { *************** *** 598,603 **** --- 615,628 ---- return (0); } + /* + * checkin_revert() + * + * If there are no differences between the working file and the latest revision + * and the -f flag is not specified, simply revert to the latest version and + * warn the user. + * + */ static void checkin_revert(struct checkin_params *pb) { *************** *** 617,622 **** --- 642,653 ---- printf("done\n"); } + /* + * checkin_checklock() + * + * Check for the existence of a lock on the file. If there are no locks, or it + * is not locked by the correct user, return -1. Otherwise, return 0. + */ static int checkin_checklock(struct checkin_params *pb) {