New upstream version 1.3.0+dfsg.1

[libgit2.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 90f700a001134d8329ca7c5632438a4fe0117520..48928940dbc7f1ff52558513d812cb170162b6f9 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -61,7 +61,8 @@ int git_reader_for_tree(git_reader **out, git_tree *tree)
 {
        tree_reader *reader;
 
-       assert(out && tree);
+       GIT_ASSERT_ARG(out);
+       GIT_ASSERT_ARG(tree);
 
        reader = git__calloc(1, sizeof(tree_reader));
        GIT_ERROR_CHECK_ALLOC(reader);
@@ -97,8 +98,7 @@ static int workdir_reader_read(
        git_oid id;
        int error;
 
-       if ((error = git_buf_joinpath(&path,
-               git_repository_workdir(reader->repo), filename)) < 0)
+       if ((error = git_repository_workdir_path(&path, reader->repo, filename)) < 0)
                goto done;
 
        if ((error = p_lstat(path.ptr, &st)) < 0) {
@@ -158,7 +158,8 @@ int git_reader_for_workdir(
        workdir_reader *reader;
        int error;
 
-       assert(out && repo);
+       GIT_ASSERT_ARG(out);
+       GIT_ASSERT_ARG(repo);
 
        reader = git__calloc(1, sizeof(workdir_reader));
        GIT_ERROR_CHECK_ALLOC(reader);
@@ -223,7 +224,8 @@ int git_reader_for_index(
        index_reader *reader;
        int error;
 
-       assert(out && repo);
+       GIT_ASSERT_ARG(out);
+       GIT_ASSERT_ARG(repo);
 
        reader = git__calloc(1, sizeof(index_reader));
        GIT_ERROR_CHECK_ALLOC(reader);
@@ -251,7 +253,9 @@ int git_reader_read(
        git_reader *reader,
        const char *filename)
 {
-       assert(out && reader && filename);
+       GIT_ASSERT_ARG(out);
+       GIT_ASSERT_ARG(reader);
+       GIT_ASSERT_ARG(filename);
 
        return reader->read(out, out_id, out_filemode, reader, filename);
 }