SOURCES: tla-debian.patch (NEW) - new, from debian
arekm
arekm at pld-linux.org
Mon Jan 2 18:29:38 CET 2006
Author: arekm Date: Mon Jan 2 17:29:38 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new, from debian
---- Files affected:
SOURCES:
tla-debian.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/tla-debian.patch
diff -u /dev/null SOURCES/tla-debian.patch:1.1
--- /dev/null Mon Jan 2 18:29:38 2006
+++ SOURCES/tla-debian.patch Mon Jan 2 18:29:33 2006
@@ -0,0 +1,1954 @@
+--- tla-1.3.3.orig/src/tla/libfsutils/dir-listing.c
++++ tla-1.3.3/src/tla/libfsutils/dir-listing.c
+@@ -26,7 +26,7 @@
+
+ while (!safe_readdir (&file, dir))
+ {
+- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), 0);
++ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), rel_record_null);
+ lim_free (0, file);
+ }
+
+@@ -50,7 +50,7 @@
+ {
+ while (!safe_readdir (&file, dir))
+ {
+- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), 0);
++ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), rel_record_null);
+ lim_free (0, file);
+ }
+
+--- tla-1.3.3.orig/src/tla/libfsutils/find-utils.c
++++ tla-1.3.3/src/tla/libfsutils/find-utils.c
+@@ -26,7 +26,7 @@
+
+ if (!S_ISDIR (stat_buf.st_mode))
+ {
+- rel_add_records (out, rel_singleton_record_taking (rel_make_field_str (path)), 0);
++ rel_add_records (out, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
+ }
+ else
+ {
+--- tla-1.3.3.orig/src/tla/libawk/relational.c
++++ tla-1.3.3/src/tla/libawk/relational.c
+@@ -329,6 +329,7 @@
+ return answer;
+ }
+
++const rel_record rel_record_null;
+
+ void
+ rel_add_records (rel_table * table, ...)
+@@ -467,7 +468,7 @@
+ while (*end && !char_is_space (*end))
+ ++end;
+
+- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), 0);
++ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), rel_record_null);
+
+ start = end;
+ }
+@@ -495,7 +496,7 @@
+ while (*end && (*end != '\n'))
+ ++end;
+
+- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), 0);
++ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), rel_record_null);
+
+ if (*end)
+ start = end + 1;
+@@ -837,7 +838,7 @@
+ lim = ar_size ((void *)t._r, 0, sizeof (rel_record));
+ for (x = 0; x < lim; ++x)
+ {
+- rel_add_records (&answer, rel_cut_record (fields, t._r[x]), 0);
++ rel_add_records (&answer, rel_cut_record (fields, t._r[x]), rel_record_null);
+ }
+
+ return answer;
+--- tla-1.3.3.orig/src/tla/libawk/relational.h
++++ tla-1.3.3/src/tla/libawk/relational.h
+@@ -31,6 +31,8 @@
+ };
+ typedef struct rel_record rel_record;
+
++extern const rel_record rel_record_null;
++
+ struct rel_table
+ {
+ rel_record * _r;
+@@ -107,6 +109,7 @@
+ rel_field f6,
+ rel_field f7);
+ extern void rel_add_records (rel_table * table, ...);
++ /* must terminate list with rel_record_null, NOT 0 or NULL ! */
+ extern void rel_add_field_taking (rel_record * r, rel_field field);
+ extern void rel_add_field_to_row_taking (rel_table table, ssize_t row, rel_field field);
+ extern rel_record rel_singleton_record_taking (rel_field field);
+--- tla-1.3.3.orig/src/tla/libarch/tag.c
++++ tla-1.3.3/src/tla/libarch/tag.c
+@@ -122,7 +122,7 @@
+
+ revision = str_alloc_cat_many (0, version, "--", this_level, str_end);
+
+- arch_run_hook ("tag", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TAGGED_ARCHIVE", from_arch->name, "ARCH_TAGGED_REVISION", from_revision, 0);
++ arch_run_hook ("tag", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TAGGED_ARCHIVE", from_arch->name, "ARCH_TAGGED_REVISION", from_revision, (t_uchar*)0);
+
+ lim_free (0, revision);
+ }
+@@ -187,7 +187,7 @@
+
+ merge_points = arch_archive_merge_points (from_arch, from_revision, 0, 0, 1);
+ fqrevision = arch_fully_qualify (arch->name, revision);
+- rel_add_records (&merge_points, rel_make_record_2_taking (rel_make_field_str ("!!!!!nothing-should-depend-on-this"), rel_make_field_str (fqrevision)), 0);
++ rel_add_records (&merge_points, rel_make_record_2_taking (rel_make_field_str ("!!!!!nothing-should-depend-on-this"), rel_make_field_str (fqrevision)), rel_record_null);
+ rel_sort_table_by_field (0, merge_points, 1);
+ rel_uniq_by_field (&merge_points, 1);
+ arch_sort_table_by_name_field (0, merge_points, 1);
+--- tla-1.3.3.orig/src/tla/libarch/cmd-changeset.c
++++ tla-1.3.3/src/tla/libarch/cmd-changeset.c
+@@ -144,7 +144,7 @@
+ x++;
+
+ while (x < argc)
+- rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[x++])), 0);
++ rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[x++])), rel_record_null);
+ }
+
+ if (file_list_file)
+--- tla-1.3.3.orig/src/tla/libarch/cmd-archive-setup.c
++++ tla-1.3.3/src/tla/libarch/cmd-archive-setup.c
+@@ -196,7 +196,7 @@
+ exit (1);
+ }
+ for (x = 1; x < argc; ++x)
+- rel_add_records (&wants, rel_singleton_record_taking (rel_make_field_str (argv[x])), 0);
++ rel_add_records (&wants, rel_singleton_record_taking (rel_make_field_str (argv[x])), rel_record_null);
+ }
+
+ for (x = 0; x < rel_n_records (wants); ++x)
+@@ -221,7 +221,7 @@
+ }
+
+ if (tag_op == arch_archive_setup_no_tags)
+- rel_add_records (&wants_decomposed, rel_make_record_2_taking (rel_make_field_str (archive), rel_make_field_str (non_archive)), 0);
++ rel_add_records (&wants_decomposed, rel_make_record_2_taking (rel_make_field_str (archive), rel_make_field_str (non_archive)), rel_record_null);
+ else
+ {
+ t_uchar * from_archive = 0;
+@@ -242,7 +242,7 @@
+ rel_make_field_str (non_archive),
+ rel_make_field_str (from_archive),
+ rel_make_field_str (from_rev_spec)),
+- 0);
++ rel_record_null);
+
+ lim_free (0, from_archive);
+ lim_free (0, from_rev_spec);
+--- tla-1.3.3.orig/src/tla/libarch/library-txn.c
++++ tla-1.3.3/src/tla/libarch/library-txn.c
+@@ -137,7 +137,7 @@
+ exit (2);
+ }
+
+- rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), 0);
++ rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), rel_record_null);
+ }
+
+ else
+@@ -245,7 +245,7 @@
+
+ if (require_greedy && !arch_library_is_greedy(rel_peek_str (full_user_path, x, 0)))
+ continue;
+- rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), 0);
++ rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), rel_record_null);
+ }
+
+ return search_path;
+@@ -450,7 +450,7 @@
+
+ /* this is the first patch missing
+ */
+- rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (revision)), 0);
++ rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (revision)), rel_record_null);
+
+ arch_chatter (chatter_fd, "* searching ancestor revision in library in archive %s\n", ancestor_archive);
+
+@@ -464,7 +464,7 @@
+ /* add revision to list
+ */
+
+- rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (anc_rev)), 0);
++ rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (anc_rev)), rel_record_null);
+
+ /* look in the library for the immediate ancestor
+ */
+--- tla-1.3.3.orig/src/tla/libarch/cmd-commit.c
++++ tla-1.3.3/src/tla/libarch/cmd-commit.c
+@@ -296,7 +296,7 @@
+ goto usage_error;
+
+ while (argx < argc)
+- rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[argx++])), 0);
++ rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[argx++])), rel_record_null);
+ }
+
+ if (!arch_valid_package_name (vsnspec, arch_maybe_archive, arch_req_version, 0))
+--- tla-1.3.3.orig/src/tla/libarch/archive-setup.c
++++ tla-1.3.3/src/tla/libarch/archive-setup.c
+@@ -34,7 +34,7 @@
+ {
+ rel_table wants = rel_table_nil;
+
+- rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (archive_spec), rel_make_field_str (revision_spec)), 0);
++ rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (archive_spec), rel_make_field_str (revision_spec)), rel_record_null);
+ arch_setup_archive (chatter_fd, wants, arch_archive_setup_no_tags, 0);
+
+ rel_free_table (wants);
+@@ -47,7 +47,7 @@
+ {
+ rel_table wants = rel_table_nil;
+
+- rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (arch->name), rel_make_field_str (revision_spec)), 0);
++ rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (arch->name), rel_make_field_str (revision_spec)), rel_record_null);
+ arch_setup_archive_ext (chatter_fd, wants, arch_archive_setup_no_tags, 0, arch);
+
+ rel_free_table (wants);
+--- tla-1.3.3.orig/src/tla/libarch/archives.c
++++ tla-1.3.3/src/tla/libarch/archives.c
+@@ -182,7 +182,7 @@
+ t_uchar * location = 0;
+
+ location = arch_archive_location (f, 0);
+- rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (files, x, 0), rel_make_field_str (location)), 0);
++ rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (files, x, 0), rel_make_field_str (location)), rel_record_null);
+
+ lim_free (0, location);
+ }
+--- tla-1.3.3.orig/src/tla/libarch/commit.c
++++ tla-1.3.3/src/tla/libarch/commit.c
+@@ -106,7 +106,7 @@
+
+ /* Check the error return code for the "precommit" hook and exit if non-zero.
+ */
+- error = arch_run_hook ("precommit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, 0) ;
++ error = arch_run_hook ("precommit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, (t_uchar*)0) ;
+ if (error)
+ {
+ safe_printfmt (2, "arch_commit: precommit hook function failed with error (%d)\n commit cancelled.\n", error);
+@@ -164,7 +164,7 @@
+ arch_snap_inode_sig_files(tree_root, arch->name, prev_revision, revision, file_list);
+ }
+
+- arch_run_hook ("commit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, 0);
++ arch_run_hook ("commit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, (t_uchar*)0);
+
+ lim_free (0, version);
+ lim_free (0, this_level);
+@@ -590,7 +590,7 @@
+ id = rel_peek_str (table, x, 1);
+
+ if (str_cmp_prefix ("A_", id))
+- rel_add_records (&answer, rel_copy_record (rel_peek_record (table, x)), 0);
++ rel_add_records (&answer, rel_copy_record (rel_peek_record (table, x)), rel_record_null);
+ }
+
+ return answer;
+@@ -669,7 +669,7 @@
+ rel_make_record_3_taking (rel_make_field_str (fqrev),
+ rel_get_field (table, x, 1),
+ rel_get_field (table, x, 2)),
+- 0);
++ rel_record_null);
+ }
+ }
+ }
+--- tla-1.3.3.orig/src/tla/libarch/namespace.c
++++ tla-1.3.3/src/tla/libarch/namespace.c
+@@ -849,7 +849,7 @@
+ for (x = 0; x < rel_n_records (in); ++x)
+ {
+ if (arch_valid_archive_name (rel_peek_str (in, x, field)))
+- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
++ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
+ }
+
+ return answer;
+@@ -865,7 +865,7 @@
+ for (x = 0; x < rel_n_records (in); ++x)
+ {
+ if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_category, 0))
+- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
++ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
+ }
+
+ return answer;
+@@ -880,7 +880,7 @@
+ for (x = 0; x < rel_n_records (in); ++x)
+ {
+ if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_package, 0))
+- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
++ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
+ }
+
+ return answer;
+@@ -895,7 +895,7 @@
+ for (x = 0; x < rel_n_records (in); ++x)
+ {
+ if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_version, 0))
+- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
++ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
+ }
+
+ return answer;
+@@ -910,7 +910,7 @@
+ for (x = 0; x < rel_n_records (in); ++x)
+ {
+ if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_patch_level, 0))
+- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
++ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
+ }
+
+ return answer;
+@@ -925,7 +925,7 @@
+ for (x = 0; x < rel_n_records (in); ++x)
+ {
+ if (arch_valid_patch_level_name (rel_peek_str (in, x, field)))
+- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
++ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
+ }
+
+ return answer;
+--- tla-1.3.3.orig/src/tla/libarch/patch-logs.c
++++ tla-1.3.3/src/tla/libarch/patch-logs.c
+@@ -380,7 +380,7 @@
+ continue;
+
+ if (arch_valid_package_name (rel_peek_str (dir_listing, x, 0), arch_no_archive, arch_req_category, 0))
+- rel_add_records (&categories, rel_copy_record (rel_peek_record (dir_listing, x)), 0);
++ rel_add_records (&categories, rel_copy_record (rel_peek_record (dir_listing, x)), rel_record_null);
+ }
+ rel_free_table (dir_listing);
+
+@@ -422,7 +422,7 @@
+
+ branch_path = file_name_in_vicinity (0, cat_dir, maybe_branch);
+ rel_field_ref (maybe_branch_field);
+- rel_add_records (&branches, rel_make_record_2_taking (maybe_branch_field, rel_make_field_str (branch_path)), 0);
++ rel_add_records (&branches, rel_make_record_2_taking (maybe_branch_field, rel_make_field_str (branch_path)), rel_record_null);
+ lim_free (0, branch_path);
+ }
+
+@@ -475,7 +475,7 @@
+
+ version_path = file_name_in_vicinity (0, branch_dir, maybe_version);
+ rel_field_ref (maybe_version_field);
+- rel_add_records (&versions, rel_make_record_2_taking (maybe_version_field, rel_make_field_str (version_path)), 0);
++ rel_add_records (&versions, rel_make_record_2_taking (maybe_version_field, rel_make_field_str (version_path)), rel_record_null);
+ lim_free (0, version_path);
+ }
+
+@@ -528,7 +528,7 @@
+ t_uchar * fqversion;
+
+ fqversion = arch_fully_qualify (maybe_archive, version);
+- rel_add_records (&log_versions, rel_make_record_2_taking (rel_make_field_str (fqversion), rel_make_field_str (patch_log_path)), 0);
++ rel_add_records (&log_versions, rel_make_record_2_taking (rel_make_field_str (fqversion), rel_make_field_str (patch_log_path)), rel_record_null);
+ lim_free (0, fqversion);
+ }
+
+@@ -623,14 +623,14 @@
+
+ if (!full)
+ {
+- rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (dir_listing, x, 0), rel_make_field_str (path)), 0);
++ rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (dir_listing, x, 0), rel_make_field_str (path)), rel_record_null);
+ }
+ else
+ {
+ t_uchar * full_name = 0;
+
+ full_name = str_alloc_cat_many (0, archive, "/", version, "--", rel_peek_str (dir_listing, x, 0), str_end);
+- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (full_name), rel_make_field_str (path)), 0);
++ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (full_name), rel_make_field_str (path)), rel_record_null);
+ lim_free (0, full_name);
+ }
+
+@@ -774,7 +774,7 @@
+ if (headers)
+ assoc_set_taking (headers, rel_make_field_str (field_name), rel_make_field_str (field_value));
+ if (headers_list)
+- rel_add_records (headers_list, rel_make_record_2_taking (rel_make_field_str (field_name), rel_make_field_str (field_value)), 0);
++ rel_add_records (headers_list, rel_make_record_2_taking (rel_make_field_str (field_name), rel_make_field_str (field_value)), rel_record_null);
+
+ lim_free (0, field_name);
+ lim_free (0, field_value);
+--- tla-1.3.3.orig/src/tla/libarch/archive-pfs.c
++++ tla-1.3.3/src/tla/libarch/archive-pfs.c
+@@ -305,7 +305,7 @@
+ file = rel_peek_str (files, x, 0);
+ if ( arch_valid_package_name (file, arch_no_archive, req_type, 1)
+ && !str_cmp_prefix (prefix, file))
+- rel_add_records (&answer, rel_make_record_1_taking (rel_make_field_str (arch_parse_package_name (ret_type, NULL, file))), 0);
++ rel_add_records (&answer, rel_make_record_1_taking (rel_make_field_str (arch_parse_package_name (ret_type, NULL, file))), rel_record_null);
+ }
+
+ rel_free_table (files);
+--- tla-1.3.3.orig/src/tla/libarch/cmd-join-branch.c
++++ tla-1.3.3/src/tla/libarch/cmd-join-branch.c
+@@ -221,7 +221,7 @@
+ else
+ dest = str_save (0, upon);
+
+- arch_call_cmd (arch_cmd_replay, argv[0], "--dir", dest, fqbase0, ((escape_classes == 0) ? "--unescaped" : 0), 0);
++ arch_call_cmd (arch_cmd_replay, argv[0], "--dir", dest, fqbase0, ((escape_classes == 0) ? "--unescaped" : 0), (char*)0);
+
+
+ lim_free (0, archive);
+--- tla-1.3.3.orig/src/tla/libarch/whats-new.c
++++ tla-1.3.3/src/tla/libarch/whats-new.c
+@@ -41,7 +41,7 @@
+
+ while (x < rel_n_records (available))
+ {
+- rel_add_records (&answer, rel_singleton_record_taking (rel_get_field (available, x, 0)), 0);
++ rel_add_records (&answer, rel_singleton_record_taking (rel_get_field (available, x, 0)), rel_record_null);
+ ++x;
+ }
+
+--- tla-1.3.3.orig/src/tla/libarch/cmd-rbrowse.c
++++ tla-1.3.3/src/tla/libarch/cmd-rbrowse.c
+@@ -279,7 +279,7 @@
+
+ if (! all_archives)
+ {
+- rel_add_records (&archive_list, rel_singleton_record_taking (rel_make_field_str (default_archive)), 0);
++ rel_add_records (&archive_list, rel_singleton_record_taking (rel_make_field_str (default_archive)), rel_record_null);
+ }
+ else
+ {
+@@ -525,7 +525,7 @@
+
+ if (regexec (&patch_regex_needle, summary, 0, 0, 0) == 0)
+ {
+- rel_add_records (&patch_output, rel_singleton_record_taking (rel_make_field_str (log)), 0);
++ rel_add_records (&patch_output, rel_singleton_record_taking (rel_make_field_str (log)), rel_record_null);
+ }
+
+ lim_free(0, summary);
+@@ -592,7 +592,7 @@
+ t_uchar *latest_revision;
+
+ latest_revision = arch_archive_latest_revision (arch, version, 1);
+- rel_add_records (since_output, rel_singleton_record_taking (rel_make_field_str (latest_revision)),0);
++ rel_add_records (since_output, rel_singleton_record_taking (rel_make_field_str (latest_revision)),rel_record_null);
+ lim_free(0, latest_revision);
+
+ }
+--- tla-1.3.3.orig/src/tla/libarch/apply-changeset.c
++++ tla-1.3.3/src/tla/libarch/apply-changeset.c
+@@ -497,7 +497,7 @@
+ rel_add_records (&r->removed_dirs,
+ rel_make_record_2_taking (target_loc_field,
+ id_field),
+- 0);
++ rel_record_null);
+ }
+ tmp_name = set_aside_shuffled_dirs (&file_set_aside_with_dir_id, &dir_set_aside_with_dir_id, target_loc, id, seq, tmp_shuffled_dirs_root, &running, target, &inventory);
+ ++seq;
+@@ -578,7 +578,7 @@
+ rel_make_record_3_taking (rel_get_field (changeset.added_dirs, x, 0),
+ rel_make_field_str (""),
+ rel_get_field (changeset.added_dirs, x, 1)),
+- 0);
++ rel_record_null);
+ }
+ rel_sort_table_by_field_fn (0, install_dirs_plan, 0, dir_depth_cmp);
+
+@@ -662,12 +662,12 @@
+ if (!deferred_conflict (&deferred_conflicts, removed_patch_conflict_files_path, target, install_loc, 0))
+ {
+ invoke_apply_changeset_callback (r, "A/ %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->new_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->new_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), rel_record_null);
+ }
+ else
+ {
+ invoke_apply_changeset_callback (r, "CA/ %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->conflict_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->conflict_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), rel_record_null);
+ }
+
+ safe_mkdir (install_name, perms);
+@@ -701,12 +701,12 @@
+ rel_make_record_3_taking (rel_field_ref (oldtgtloc_field),
+ rel_make_field_str (install_loc),
+ id_field),
+- 0);
++ rel_record_null);
+ }
+ else
+ {
+ invoke_apply_changeset_callback (r, "C/> %s\t%s\n", escaped_tmp0, no_dot (escaped_tmp1));
+- rel_add_records (&r->conflict_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->conflict_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), rel_record_null);
+ }
+
+ rel_field_unref (oldtgtloc_field);
+@@ -788,12 +788,12 @@
+ rel_make_record_3_taking (rel_field_ref (old_target_loc_field),
+ rel_make_field_str (install_loc),
+ rel_field_ref (id_field)),
+- 0);
++ rel_record_null);
+ }
+ else
+ {
+ invoke_apply_changeset_callback (r, "C=> %s\t%s\n", escaped_tmp0, no_dot (escaped_tmp1));
+- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), rel_record_null);
+ }
+
+ safe_rename (take_from, install_name);
+@@ -856,12 +856,12 @@
+ if (!deferred_conflict (&deferred_conflicts, removed_patch_conflict_files_path, target, install_loc, take_from))
+ {
+ invoke_apply_changeset_callback (r, "A %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->new_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->new_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), rel_record_null);
+ }
+ else
+ {
+ invoke_apply_changeset_callback (r, "CA %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), rel_record_null);
+ }
+
+ copy_file_or_symlink (take_from, install_name);
+@@ -912,7 +912,7 @@
+ {
+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, mod_loc);
+ invoke_apply_changeset_callback (r, "?M %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->missing_file_for_patch, rel_make_record_2_taking (rel_field_ref (mod_loc_field), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->missing_file_for_patch, rel_make_record_2_taking (rel_field_ref (mod_loc_field), rel_field_ref (id_field)), rel_record_null);
+ save_patch_for_missing_file (missing_patch_dir, patch_path, mod_loc);
+ lim_free (0, escaped_tmp);
+ continue;
+@@ -937,7 +937,7 @@
+
+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
+ invoke_apply_changeset_callback (r, "C-> %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), rel_record_null);
+ lim_free (0, escaped_tmp);
+ }
+ else if (arch_id_indicates_changelog (id))
+@@ -946,7 +946,7 @@
+ rel_make_record_3_taking (rel_field_ref (target_loc_field),
+ rel_field_ref (id_field),
+ rel_make_field_str (target_path)),
+- 0);
++ rel_record_null);
+ }
+ else
+ {
+@@ -1010,7 +1010,7 @@
+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
+ invoke_apply_changeset_callback (r, "M %s\n",
+ no_dot (escaped_tmp));
+- rel_add_records (&r->modified_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->modified_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), rel_record_null);
+ lim_free (0, escaped_tmp);
+ }
+ else if (patch_stat == 1)
+@@ -1024,7 +1024,7 @@
+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
+ invoke_apply_changeset_callback (r, "C %s\n",
+ no_dot (escaped_tmp));
+- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), rel_record_null);
+
+ lim_free (0, escaped_tmp);
+ lim_free (0, orig_name);
+@@ -1111,7 +1111,7 @@
+ {
+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, mod_loc);
+ invoke_apply_changeset_callback (r, "?M %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->missing_file_for_patch, rel_make_record_2_taking (rel_field_ref (mod_loc_field), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->missing_file_for_patch, rel_make_record_2_taking (rel_field_ref (mod_loc_field), rel_field_ref (id_field)), rel_record_null);
+ save_patch_for_missing_file (missing_patch_dir, orig_patch_path, mod_loc);
+ save_patch_for_missing_file (missing_patch_dir, mod_patch_path, mod_loc);
+ lim_free (0, escaped_tmp);
+@@ -1151,7 +1151,7 @@
+
+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
+ invoke_apply_changeset_callback (r, "C-> %s\n", no_dot (escaped_tmp));
+- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
++ rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), rel_record_null);
+
+ lim_free (0, escaped_tmp);
+ lim_free (0, orig_name);
+@@ -1213,7 +1213,7 @@
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list