[BACK]Return to diff.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / diff

Diff for /src/usr.bin/diff/diff.h between version 1.17 and 1.18

version 1.17, 2003/07/06 22:17:21 version 1.18, 2003/07/09 00:07:44
Line 51 
Line 51 
 #define D_EMPTY1        2       /* Treat first file as empty (/dev/null) */  #define D_EMPTY1        2       /* Treat first file as empty (/dev/null) */
 #define D_EMPTY2        4       /* Treat second file as empty (/dev/null) */  #define D_EMPTY2        4       /* Treat second file as empty (/dev/null) */
   
   /*
    * Status values for print_status() and diffreg() return values
    */
   #define D_SAME          0       /* Files are the same */
   #define D_DIFFER        1       /* Files are different */
   #define D_BINARY        2       /* Binary files are different */
   #define D_COMMON        3       /* Subdirectory common to both dirs */
   #define D_ONLY          4       /* Only exists in one directory */
   #define D_ERROR         5       /* An error ocurred */
   
 struct excludes {  struct excludes {
         char *pattern;          char *pattern;
         struct excludes *next;          struct excludes *next;
 };  };
   
 extern int      aflag, bflag, iflag, Nflag, Pflag, rflag, sflag, tflag, wflag;  extern int      aflag, bflag, iflag, lflag, Nflag, Pflag, rflag, sflag,
                   tflag, wflag;
 extern char     *start, *ifdefname;  extern char     *start, *ifdefname;
 extern int      format, context, status, anychange;  extern int      format, context, status, anychange;
 extern char     *tempfiles[], *diffargs;  extern char     *tempfiles[], *diffargs;
Line 65 
Line 76 
   
 char    *copytemp(const char *, int);  char    *copytemp(const char *, int);
 char    *splice(char *, char *);  char    *splice(char *, char *);
   int     diffreg(char *, char *, int);
   int     easprintf(char **, const char *, ...);
 void    *emalloc(size_t);  void    *emalloc(size_t);
 void    *erealloc(void *, size_t);  void    *erealloc(void *, size_t);
 void    diffdir(char *, char *);  void    diffdir(char *, char *);
 void    diffreg(char *, char *, int);  void    print_status(int, char *, char *, char *);
 void    quit(int);  void    quit(int);
 __dead void error(const char *, ...);  __dead void error(const char *, ...);
 __dead void errorx(const char *, ...);  __dead void errorx(const char *, ...);

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18