thodg/libgit2/src/xdiff/xutils.h

• Show log

  Commit

• Hash : 7f52bc5a
  Author :
  Date : 2018-01-20T18:19:26
  

  xdiff: upgrade to git's included xdiff Upgrade xdiff to git's most recent version, which includes changes to CR/LF handling. Now CR/LF included in the input files will be detected and conflict markers will be emitted with CR/LF when appropriate.

Download

• src/xdiff/xutils.h

• /*
   *  LibXDiff by Davide Libenzi ( File Differential Library )
   *  Copyright (C) 2003  Davide Libenzi
   *
   *  This library is free software; you can redistribute it and/or
   *  modify it under the terms of the GNU Lesser General Public
   *  License as published by the Free Software Foundation; either
   *  version 2.1 of the License, or (at your option) any later version.
   *
   *  This library is distributed in the hope that it will be useful,
   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   *  Lesser General Public License for more details.
   *
   *  You should have received a copy of the GNU Lesser General Public
   *  License along with this library; if not, see
   *  <http://www.gnu.org/licenses/>.
   *
   *  Davide Libenzi <davidel@xmailserver.org>
   *
   */
  
  #if !defined(XUTILS_H)
  #define XUTILS_H
  
  
  
  long xdl_bogosqrt(long n);
  int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
  		     xdemitcb_t *ecb);
  int xdl_cha_init(chastore_t *cha, long isize, long icount);
  void xdl_cha_free(chastore_t *cha);
  void *xdl_cha_alloc(chastore_t *cha);
  long xdl_guess_lines(mmfile_t *mf, long sample);
  int xdl_blankline(const char *line, long size, long flags);
  int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags);
  unsigned long xdl_hash_record(char const **data, char const *top, long flags);
  unsigned int xdl_hashbits(unsigned int size);
  int xdl_num_out(char *out, long val);
  int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
  		      const char *func, long funclen, xdemitcb_t *ecb);
  int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp,
  		       int line1, int count1, int line2, int count2);
  
  
  
  #endif /* #if !defined(XUTILS_H) */
  

Download