[BACK]Return to ci.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / rcs

Diff for /src/usr.bin/rcs/ci.c between version 1.58 and 1.59

version 1.58, 2005/11/16 19:06:41 version 1.59, 2005/11/16 19:23:46
Line 400 
Line 400 
         return (status);          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 *  static char *
 checkin_diff_file(struct checkin_params *pb)  checkin_diff_file(struct checkin_params *pb)
 {  {
Line 458 
Line 464 
 }  }
   
 /*  /*
    * checkin_getlogmsg()
    *
  * Get log message from user interactively.   * Get log message from user interactively.
    * Returns pointer to a char array on success, NULL on failure.
  */   */
 static char *  static char *
 checkin_getlogmsg(RCSNUM *rev, RCSNUM *rev2)  checkin_getlogmsg(RCSNUM *rev, RCSNUM *rev2)
Line 489 
Line 498 
  * checkin_getdesc()   * checkin_getdesc()
  *   *
  * Get file description interactively.   * Get file description interactively.
  * Returns NULL on failure.   * Returns pointer to a char array on success, NULL on failure.
  */   */
 static char *  static char *
 checkin_getdesc()  checkin_getdesc()
Line 503 
Line 512 
 /*  /*
  * checkin_getinput()   * checkin_getinput()
  *   *
  * Get some input from the user.   * Get some input from the user, in RCS style, prompting with message <prompt>.
    * Returns pointer to a char array on success, NULL on failure.
  */   */
 static char *  static char *
 checkin_getinput(const char *prompt)  checkin_getinput(const char *prompt)
Line 535 
Line 545 
  * checkin_init()   * checkin_init()
  *   *
  * Does an initial check in, just enough to create the new ,v file   * Does an initial check in, just enough to create the new ,v file
    * XXX not full implemented yet.
  */   */
 static void  static void
 checkin_init(struct checkin_params *pb)  checkin_init(struct checkin_params *pb)
Line 571 
Line 582 
         }          }
 }  }
   
   /*
    * checkin_attach_symbol()
    *
    * Attempt to attach the specified symbol to the revision.
    * On success, return 0. On error return -1.
    */
 static int  static int
 checkin_attach_symbol(struct checkin_params *pb)  checkin_attach_symbol(struct checkin_params *pb)
 {  {
Line 598 
Line 615 
         return (0);          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  static void
 checkin_revert(struct checkin_params *pb)  checkin_revert(struct checkin_params *pb)
 {  {
Line 617 
Line 642 
                 printf("done\n");                  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  static int
 checkin_checklock(struct checkin_params *pb)  checkin_checklock(struct checkin_params *pb)
 {  {
Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59