comparison kdiff3/src/gnudiff_io.cpp @ 53:32d5cbf9db71

Corrections for 0.9.81:
- Fix for configure --enable-final
- Bugfixes
- First steps towards internationalisation

 /* File I/O for GNU DIFF.
 
    Modified for KDiff3 by Joachim Eibl 2003.
+   The original file was part of GNU DIFF.
 
    Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002
    Free Software Foundation, Inc.
-
-   This file is part of GNU DIFF.
 
    GNU DIFF is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.

    If not, write to the Free Software Foundation,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "gnudiff_diff.h"
 #include <stdlib.h>
-#include "gnudiff_xalloc.h"
-
-namespace GnuDiff
-{
 
 /* Rotate an unsigned value to the left.  */
 #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n)))
 
 /* Given a hash value and a new character, return a new hash value.  */

 
 
 /* Split the file into lines, simultaneously computing the equivalence
    class for each line.  */
 
-static void
-find_and_hash_each_line (struct file_data *current)
+void GnuDiff::find_and_hash_each_line (struct file_data *current)
 {
   hash_value h;
   unsigned char const *p = (unsigned char const *) current->prefix_end;
   unsigned char c;
   lin i, *bucket;

 /* Prepare the text.  Make sure the text end is initialized.
    Make sure text ends in a newline,
    but remember that we had to add one.
    Strip trailing CRs, if that was requested.  */
 
-static void
-prepare_text (struct file_data *current)
+void GnuDiff::prepare_text (struct file_data *current)
 {
   size_t buffered = current->buffered;
   char *p = FILE_BUFFER (current);
   char *dst;
 

 }
 
 /* Given a vector of two file_data objects, find the identical
    prefixes and suffixes of each object.  */
 
-static void
-find_identical_ends (struct file_data filevec[])
+void GnuDiff::find_identical_ends (struct file_data filevec[])
 {
   word *w0, *w1;
   char *p0, *p1, *buffer0, *buffer1;
   char const *end0, *beg0;
   char const **linbuf0, **linbuf1;

    with each one, and build the table of equivalence classes.
    Return nonzero if either file appears to be a binary file.
    If PRETEND_BINARY is nonzero, pretend they are binary regardless.  */
 
 bool
-read_files (struct file_data filevec[], bool /*pretend_binary*/)
+GnuDiff::read_files (struct file_data filevec[], bool /*pretend_binary*/)
 {
   int i;
 
   find_identical_ends (filevec);
 

   free (equivs);
   free (buckets - 1);
 
   return 0;
 }
-
-} // namespace GnuDiff