+2020-05-28 Bruno Haible <bruno@clisp.org>
+
+ Fix build errors due to read-file changes (regression from 2020-05-27).
+ * lib/git-merge-changelog.c (read_changelog_file): Update read_file
+ invocation.
+ * tests/test-sameacls.c (main): Likewise.
+ * tests/test-pipe-filter-gi1.c (main): Call read_file instead of
+ read_binary_file.
+ * tests/test-pipe-filter-ii1.c (main): Likewise.
+
2020-05-28 Bruno Haible <bruno@clisp.org>
fts: Make more robust in multithreaded applications.
/* git-merge-changelog - git "merge" driver for GNU style ChangeLog files.
- Copyright (C) 2008-2010 Bruno Haible <bruno@clisp.org>
+ Copyright (C) 2008-2020 Bruno Haible <bruno@clisp.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/* Read the file in text mode, otherwise it's hard to recognize empty
lines. */
size_t length;
- char *contents = read_file (filename, &length);
+ char *contents = read_file (filename, 0, &length);
if (contents == NULL)
{
fprintf (stderr, "could not read file '%s'\n", filename);
/* Read some text from a file. */
input_filename = argv[2];
- input = read_binary_file (input_filename, &input_size);
+ input = read_file (input_filename, RF_BINARY, &input_size);
ASSERT (input != NULL);
/* Convert it to uppercase, line by line. */
/* Read some text from a file. */
input_filename = argv[2];
- input = read_binary_file (input_filename, &input_size);
+ input = read_file (input_filename, RF_BINARY, &input_size);
ASSERT (input != NULL);
/* Convert it to uppercase, line by line. */
size_t size2;
char *contents2;
- contents1 = read_file (file1, &size1);
+ contents1 = read_file (file1, 0, &size1);
if (contents1 == NULL)
{
fprintf (stderr, "error reading file %s: errno = %d\n", file1, errno);
fflush (stderr);
abort ();
}
- contents2 = read_file (file2, &size2);
+ contents2 = read_file (file2, 0, &size2);
if (contents2 == NULL)
{
fprintf (stderr, "error reading file %s: errno = %d\n", file2, errno);