]> git.pld-linux.org Git - packages/tla.git/blame - tla-debian.patch
projects / packages / tla.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- new, from debian
[packages/tla.git] / tla-debian.patch
CommitLineData
7811b2ca
AM		 1--- tla-1.3.3.orig/src/tla/libfsutils/dir-listing.c
2+++ tla-1.3.3/src/tla/libfsutils/dir-listing.c
3@@ -26,7 +26,7 @@
4
5 while (!safe_readdir (&file, dir))
6 {
7- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), 0);
8+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), rel_record_null);
9 lim_free (0, file);
10 }
11
12@@ -50,7 +50,7 @@
13 {
14 while (!safe_readdir (&file, dir))
15 {
16- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), 0);
17+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), rel_record_null);
18 lim_free (0, file);
19 }
20
21--- tla-1.3.3.orig/src/tla/libfsutils/find-utils.c
22+++ tla-1.3.3/src/tla/libfsutils/find-utils.c
23@@ -26,7 +26,7 @@
24
25 if (!S_ISDIR (stat_buf.st_mode))
26 {
27- rel_add_records (out, rel_singleton_record_taking (rel_make_field_str (path)), 0);
28+ rel_add_records (out, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
29 }
30 else
31 {
32--- tla-1.3.3.orig/src/tla/libawk/relational.c
33+++ tla-1.3.3/src/tla/libawk/relational.c
34@@ -329,6 +329,7 @@
35 return answer;
36 }
37
38+const rel_record rel_record_null;
39
40 void
41 rel_add_records (rel_table * table, ...)
42@@ -467,7 +468,7 @@
43 while (*end && !char_is_space (*end))
44 ++end;
45
46- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), 0);
47+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), rel_record_null);
48
49 start = end;
50 }
51@@ -495,7 +496,7 @@
52 while (*end && (*end != '\n'))
53 ++end;
54
55- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), 0);
56+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str_n (start, end - start)), rel_record_null);
57
58 if (*end)
59 start = end + 1;
60@@ -837,7 +838,7 @@
61 lim = ar_size ((void *)t._r, 0, sizeof (rel_record));
62 for (x = 0; x < lim; ++x)
63 {
64- rel_add_records (&answer, rel_cut_record (fields, t._r[x]), 0);
65+ rel_add_records (&answer, rel_cut_record (fields, t._r[x]), rel_record_null);
66 }
67
68 return answer;
69--- tla-1.3.3.orig/src/tla/libawk/relational.h
70+++ tla-1.3.3/src/tla/libawk/relational.h
71@@ -31,6 +31,8 @@
72 };
73 typedef struct rel_record rel_record;
74
75+extern const rel_record rel_record_null;
76+
77 struct rel_table
78 {
79 rel_record * _r;
80@@ -107,6 +109,7 @@
81 rel_field f6,
82 rel_field f7);
83 extern void rel_add_records (rel_table * table, ...);
84+ /* must terminate list with rel_record_null, NOT 0 or NULL ! */
85 extern void rel_add_field_taking (rel_record * r, rel_field field);
86 extern void rel_add_field_to_row_taking (rel_table table, ssize_t row, rel_field field);
87 extern rel_record rel_singleton_record_taking (rel_field field);
88--- tla-1.3.3.orig/src/tla/libarch/tag.c
89+++ tla-1.3.3/src/tla/libarch/tag.c
90@@ -122,7 +122,7 @@
91
92 revision = str_alloc_cat_many (0, version, "--", this_level, str_end);
93
94- arch_run_hook ("tag", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TAGGED_ARCHIVE", from_arch->name, "ARCH_TAGGED_REVISION", from_revision, 0);
95+ 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);
96
97 lim_free (0, revision);
98 }
99@@ -187,7 +187,7 @@
100
101 merge_points = arch_archive_merge_points (from_arch, from_revision, 0, 0, 1);
102 fqrevision = arch_fully_qualify (arch->name, revision);
103- 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);
104+ 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);
105 rel_sort_table_by_field (0, merge_points, 1);
106 rel_uniq_by_field (&merge_points, 1);
107 arch_sort_table_by_name_field (0, merge_points, 1);
108--- tla-1.3.3.orig/src/tla/libarch/cmd-changeset.c
109+++ tla-1.3.3/src/tla/libarch/cmd-changeset.c
110@@ -144,7 +144,7 @@
111 x++;
112
113 while (x < argc)
114- rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[x++])), 0);
115+ rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[x++])), rel_record_null);
116 }
117
118 if (file_list_file)
119--- tla-1.3.3.orig/src/tla/libarch/cmd-archive-setup.c
120+++ tla-1.3.3/src/tla/libarch/cmd-archive-setup.c
121@@ -196,7 +196,7 @@
122 exit (1);
123 }
124 for (x = 1; x < argc; ++x)
125- rel_add_records (&wants, rel_singleton_record_taking (rel_make_field_str (argv[x])), 0);
126+ rel_add_records (&wants, rel_singleton_record_taking (rel_make_field_str (argv[x])), rel_record_null);
127 }
128
129 for (x = 0; x < rel_n_records (wants); ++x)
130@@ -221,7 +221,7 @@
131 }
132
133 if (tag_op == arch_archive_setup_no_tags)
134- rel_add_records (&wants_decomposed, rel_make_record_2_taking (rel_make_field_str (archive), rel_make_field_str (non_archive)), 0);
135+ rel_add_records (&wants_decomposed, rel_make_record_2_taking (rel_make_field_str (archive), rel_make_field_str (non_archive)), rel_record_null);
136 else
137 {
138 t_uchar * from_archive = 0;
139@@ -242,7 +242,7 @@
140 rel_make_field_str (non_archive),
141 rel_make_field_str (from_archive),
142 rel_make_field_str (from_rev_spec)),
143- 0);
144+ rel_record_null);
145
146 lim_free (0, from_archive);
147 lim_free (0, from_rev_spec);
148--- tla-1.3.3.orig/src/tla/libarch/library-txn.c
149+++ tla-1.3.3/src/tla/libarch/library-txn.c
150@@ -137,7 +137,7 @@
151 exit (2);
152 }
153
154- rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), 0);
155+ rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), rel_record_null);
156 }
157
158 else
159@@ -245,7 +245,7 @@
160
161 if (require_greedy && !arch_library_is_greedy(rel_peek_str (full_user_path, x, 0)))
162 continue;
163- rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), 0);
164+ rel_add_records (&search_path, rel_singleton_record_taking (rel_get_field (full_user_path, x, 0)), rel_record_null);
165 }
166
167 return search_path;
168@@ -450,7 +450,7 @@
169
170 /* this is the first patch missing
171 */
172- rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (revision)), 0);
173+ rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (revision)), rel_record_null);
174
175 arch_chatter (chatter_fd, "* searching ancestor revision in library in archive %s\n", ancestor_archive);
176
177@@ -464,7 +464,7 @@
178 /* add revision to list
179 */
180
181- rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (anc_rev)), 0);
182+ rel_add_records (&revisions, rel_singleton_record_taking (rel_make_field_str (anc_rev)), rel_record_null);
183
184 /* look in the library for the immediate ancestor
185 */
186--- tla-1.3.3.orig/src/tla/libarch/cmd-commit.c
187+++ tla-1.3.3/src/tla/libarch/cmd-commit.c
188@@ -296,7 +296,7 @@
189 goto usage_error;
190
191 while (argx < argc)
192- rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[argx++])), 0);
193+ rel_add_records (&file_list, rel_singleton_record_taking (rel_make_field_str (argv[argx++])), rel_record_null);
194 }
195
196 if (!arch_valid_package_name (vsnspec, arch_maybe_archive, arch_req_version, 0))
197--- tla-1.3.3.orig/src/tla/libarch/archive-setup.c
198+++ tla-1.3.3/src/tla/libarch/archive-setup.c
199@@ -34,7 +34,7 @@
200 {
201 rel_table wants = rel_table_nil;
202
203- rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (archive_spec), rel_make_field_str (revision_spec)), 0);
204+ rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (archive_spec), rel_make_field_str (revision_spec)), rel_record_null);
205 arch_setup_archive (chatter_fd, wants, arch_archive_setup_no_tags, 0);
206
207 rel_free_table (wants);
208@@ -47,7 +47,7 @@
209 {
210 rel_table wants = rel_table_nil;
211
212- rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (arch->name), rel_make_field_str (revision_spec)), 0);
213+ rel_add_records (&wants, rel_make_record_2_taking (rel_make_field_str (arch->name), rel_make_field_str (revision_spec)), rel_record_null);
214 arch_setup_archive_ext (chatter_fd, wants, arch_archive_setup_no_tags, 0, arch);
215
216 rel_free_table (wants);
217--- tla-1.3.3.orig/src/tla/libarch/archives.c
218+++ tla-1.3.3/src/tla/libarch/archives.c
219@@ -182,7 +182,7 @@
220 t_uchar * location = 0;
221
222 location = arch_archive_location (f, 0);
223- rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (files, x, 0), rel_make_field_str (location)), 0);
224+ rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (files, x, 0), rel_make_field_str (location)), rel_record_null);
225
226 lim_free (0, location);
227 }
228--- tla-1.3.3.orig/src/tla/libarch/commit.c
229+++ tla-1.3.3/src/tla/libarch/commit.c
230@@ -106,7 +106,7 @@
231
232 /* Check the error return code for the "precommit" hook and exit if non-zero.
233 */
234- error = arch_run_hook ("precommit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, 0) ;
235+ error = arch_run_hook ("precommit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, (t_uchar*)0) ;
236 if (error)
237 {
238 safe_printfmt (2, "arch_commit: precommit hook function failed with error (%d)\n commit cancelled.\n", error);
239@@ -164,7 +164,7 @@
240 arch_snap_inode_sig_files(tree_root, arch->name, prev_revision, revision, file_list);
241 }
242
243- arch_run_hook ("commit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, 0);
244+ arch_run_hook ("commit", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, (t_uchar*)0);
245
246 lim_free (0, version);
247 lim_free (0, this_level);
248@@ -590,7 +590,7 @@
249 id = rel_peek_str (table, x, 1);
250
251 if (str_cmp_prefix ("A_", id))
252- rel_add_records (&answer, rel_copy_record (rel_peek_record (table, x)), 0);
253+ rel_add_records (&answer, rel_copy_record (rel_peek_record (table, x)), rel_record_null);
254 }
255
256 return answer;
257@@ -669,7 +669,7 @@
258 rel_make_record_3_taking (rel_make_field_str (fqrev),
259 rel_get_field (table, x, 1),
260 rel_get_field (table, x, 2)),
261- 0);
262+ rel_record_null);
263 }
264 }
265 }
266--- tla-1.3.3.orig/src/tla/libarch/namespace.c
267+++ tla-1.3.3/src/tla/libarch/namespace.c
268@@ -849,7 +849,7 @@
269 for (x = 0; x < rel_n_records (in); ++x)
270 {
271 if (arch_valid_archive_name (rel_peek_str (in, x, field)))
272- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
273+ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
274 }
275
276 return answer;
277@@ -865,7 +865,7 @@
278 for (x = 0; x < rel_n_records (in); ++x)
279 {
280 if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_category, 0))
281- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
282+ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
283 }
284
285 return answer;
286@@ -880,7 +880,7 @@
287 for (x = 0; x < rel_n_records (in); ++x)
288 {
289 if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_package, 0))
290- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
291+ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
292 }
293
294 return answer;
295@@ -895,7 +895,7 @@
296 for (x = 0; x < rel_n_records (in); ++x)
297 {
298 if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_version, 0))
299- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
300+ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
301 }
302
303 return answer;
304@@ -910,7 +910,7 @@
305 for (x = 0; x < rel_n_records (in); ++x)
306 {
307 if (arch_valid_package_name (rel_peek_str (in, x, field), arch_no_archive, arch_req_patch_level, 0))
308- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
309+ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
310 }
311
312 return answer;
313@@ -925,7 +925,7 @@
314 for (x = 0; x < rel_n_records (in); ++x)
315 {
316 if (arch_valid_patch_level_name (rel_peek_str (in, x, field)))
317- rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), 0);
318+ rel_add_records (&answer, rel_copy_record (rel_peek_record (in, x)), rel_record_null);
319 }
320
321 return answer;
322--- tla-1.3.3.orig/src/tla/libarch/patch-logs.c
323+++ tla-1.3.3/src/tla/libarch/patch-logs.c
324@@ -380,7 +380,7 @@
325 continue;
326
327 if (arch_valid_package_name (rel_peek_str (dir_listing, x, 0), arch_no_archive, arch_req_category, 0))
328- rel_add_records (&categories, rel_copy_record (rel_peek_record (dir_listing, x)), 0);
329+ rel_add_records (&categories, rel_copy_record (rel_peek_record (dir_listing, x)), rel_record_null);
330 }
331 rel_free_table (dir_listing);
332
333@@ -422,7 +422,7 @@
334
335 branch_path = file_name_in_vicinity (0, cat_dir, maybe_branch);
336 rel_field_ref (maybe_branch_field);
337- rel_add_records (&branches, rel_make_record_2_taking (maybe_branch_field, rel_make_field_str (branch_path)), 0);
338+ rel_add_records (&branches, rel_make_record_2_taking (maybe_branch_field, rel_make_field_str (branch_path)), rel_record_null);
339 lim_free (0, branch_path);
340 }
341
342@@ -475,7 +475,7 @@
343
344 version_path = file_name_in_vicinity (0, branch_dir, maybe_version);
345 rel_field_ref (maybe_version_field);
346- rel_add_records (&versions, rel_make_record_2_taking (maybe_version_field, rel_make_field_str (version_path)), 0);
347+ rel_add_records (&versions, rel_make_record_2_taking (maybe_version_field, rel_make_field_str (version_path)), rel_record_null);
348 lim_free (0, version_path);
349 }
350
351@@ -528,7 +528,7 @@
352 t_uchar * fqversion;
353
354 fqversion = arch_fully_qualify (maybe_archive, version);
355- rel_add_records (&log_versions, rel_make_record_2_taking (rel_make_field_str (fqversion), rel_make_field_str (patch_log_path)), 0);
356+ 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);
357 lim_free (0, fqversion);
358 }
359
360@@ -623,14 +623,14 @@
361
362 if (!full)
363 {
364- rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (dir_listing, x, 0), rel_make_field_str (path)), 0);
365+ rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (dir_listing, x, 0), rel_make_field_str (path)), rel_record_null);
366 }
367 else
368 {
369 t_uchar * full_name = 0;
370
371 full_name = str_alloc_cat_many (0, archive, "/", version, "--", rel_peek_str (dir_listing, x, 0), str_end);
372- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (full_name), rel_make_field_str (path)), 0);
373+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (full_name), rel_make_field_str (path)), rel_record_null);
374 lim_free (0, full_name);
375 }
376
377@@ -774,7 +774,7 @@
378 if (headers)
379 assoc_set_taking (headers, rel_make_field_str (field_name), rel_make_field_str (field_value));
380 if (headers_list)
381- rel_add_records (headers_list, rel_make_record_2_taking (rel_make_field_str (field_name), rel_make_field_str (field_value)), 0);
382+ 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);
383
384 lim_free (0, field_name);
385 lim_free (0, field_value);
386--- tla-1.3.3.orig/src/tla/libarch/archive-pfs.c
387+++ tla-1.3.3/src/tla/libarch/archive-pfs.c
388@@ -305,7 +305,7 @@
389 file = rel_peek_str (files, x, 0);
390 if ( arch_valid_package_name (file, arch_no_archive, req_type, 1)
391 && !str_cmp_prefix (prefix, file))
392- rel_add_records (&answer, rel_make_record_1_taking (rel_make_field_str (arch_parse_package_name (ret_type, NULL, file))), 0);
393+ rel_add_records (&answer, rel_make_record_1_taking (rel_make_field_str (arch_parse_package_name (ret_type, NULL, file))), rel_record_null);
394 }
395
396 rel_free_table (files);
397--- tla-1.3.3.orig/src/tla/libarch/cmd-join-branch.c
398+++ tla-1.3.3/src/tla/libarch/cmd-join-branch.c
399@@ -221,7 +221,7 @@
400 else
401 dest = str_save (0, upon);
402
403- arch_call_cmd (arch_cmd_replay, argv[0], "--dir", dest, fqbase0, ((escape_classes == 0) ? "--unescaped" : 0), 0);
404+ arch_call_cmd (arch_cmd_replay, argv[0], "--dir", dest, fqbase0, ((escape_classes == 0) ? "--unescaped" : 0), (char*)0);
405
406
407 lim_free (0, archive);
408--- tla-1.3.3.orig/src/tla/libarch/whats-new.c
409+++ tla-1.3.3/src/tla/libarch/whats-new.c
410@@ -41,7 +41,7 @@
411
412 while (x < rel_n_records (available))
413 {
414- rel_add_records (&answer, rel_singleton_record_taking (rel_get_field (available, x, 0)), 0);
415+ rel_add_records (&answer, rel_singleton_record_taking (rel_get_field (available, x, 0)), rel_record_null);
416 ++x;
417 }
418
419--- tla-1.3.3.orig/src/tla/libarch/cmd-rbrowse.c
420+++ tla-1.3.3/src/tla/libarch/cmd-rbrowse.c
421@@ -279,7 +279,7 @@
422
423 if (! all_archives)
424 {
425- rel_add_records (&archive_list, rel_singleton_record_taking (rel_make_field_str (default_archive)), 0);
426+ rel_add_records (&archive_list, rel_singleton_record_taking (rel_make_field_str (default_archive)), rel_record_null);
427 }
428 else
429 {
430@@ -525,7 +525,7 @@
431
432 if (regexec (&patch_regex_needle, summary, 0, 0, 0) == 0)
433 {
434- rel_add_records (&patch_output, rel_singleton_record_taking (rel_make_field_str (log)), 0);
435+ rel_add_records (&patch_output, rel_singleton_record_taking (rel_make_field_str (log)), rel_record_null);
436 }
437
438 lim_free(0, summary);
439@@ -592,7 +592,7 @@
440 t_uchar *latest_revision;
441
442 latest_revision = arch_archive_latest_revision (arch, version, 1);
443- rel_add_records (since_output, rel_singleton_record_taking (rel_make_field_str (latest_revision)),0);
444+ rel_add_records (since_output, rel_singleton_record_taking (rel_make_field_str (latest_revision)),rel_record_null);
445 lim_free(0, latest_revision);
446
447 }
448--- tla-1.3.3.orig/src/tla/libarch/apply-changeset.c
449+++ tla-1.3.3/src/tla/libarch/apply-changeset.c
450@@ -497,7 +497,7 @@
451 rel_add_records (&r->removed_dirs,
452 rel_make_record_2_taking (target_loc_field,
453 id_field),
454- 0);
455+ rel_record_null);
456 }
457 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);
458 ++seq;
459@@ -578,7 +578,7 @@
460 rel_make_record_3_taking (rel_get_field (changeset.added_dirs, x, 0),
461 rel_make_field_str (""),
462 rel_get_field (changeset.added_dirs, x, 1)),
463- 0);
464+ rel_record_null);
465 }
466 rel_sort_table_by_field_fn (0, install_dirs_plan, 0, dir_depth_cmp);
467
468@@ -662,12 +662,12 @@
469 if (!deferred_conflict (&deferred_conflicts, removed_patch_conflict_files_path, target, install_loc, 0))
470 {
471 invoke_apply_changeset_callback (r, "A/ %s\n", no_dot (escaped_tmp));
472- rel_add_records (&r->new_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
473+ 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);
474 }
475 else
476 {
477 invoke_apply_changeset_callback (r, "CA/ %s\n", no_dot (escaped_tmp));
478- rel_add_records (&r->conflict_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
479+ 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);
480 }
481
482 safe_mkdir (install_name, perms);
483@@ -701,12 +701,12 @@
484 rel_make_record_3_taking (rel_field_ref (oldtgtloc_field),
485 rel_make_field_str (install_loc),
486 id_field),
487- 0);
488+ rel_record_null);
489 }
490 else
491 {
492 invoke_apply_changeset_callback (r, "C/> %s\t%s\n", escaped_tmp0, no_dot (escaped_tmp1));
493- rel_add_records (&r->conflict_dirs, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
494+ 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);
495 }
496
497 rel_field_unref (oldtgtloc_field);
498@@ -788,12 +788,12 @@
499 rel_make_record_3_taking (rel_field_ref (old_target_loc_field),
500 rel_make_field_str (install_loc),
501 rel_field_ref (id_field)),
502- 0);
503+ rel_record_null);
504 }
505 else
506 {
507 invoke_apply_changeset_callback (r, "C=> %s\t%s\n", escaped_tmp0, no_dot (escaped_tmp1));
508- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
509+ 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);
510 }
511
512 safe_rename (take_from, install_name);
513@@ -856,12 +856,12 @@
514 if (!deferred_conflict (&deferred_conflicts, removed_patch_conflict_files_path, target, install_loc, take_from))
515 {
516 invoke_apply_changeset_callback (r, "A %s\n", no_dot (escaped_tmp));
517- rel_add_records (&r->new_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
518+ 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);
519 }
520 else
521 {
522 invoke_apply_changeset_callback (r, "CA %s\n", no_dot (escaped_tmp));
523- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_make_field_str (install_loc), rel_field_ref (id_field)), 0);
524+ 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);
525 }
526
527 copy_file_or_symlink (take_from, install_name);
528@@ -912,7 +912,7 @@
529 {
530 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, mod_loc);
531 invoke_apply_changeset_callback (r, "?M %s\n", no_dot (escaped_tmp));
532- 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);
533+ 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);
534 save_patch_for_missing_file (missing_patch_dir, patch_path, mod_loc);
535 lim_free (0, escaped_tmp);
536 continue;
537@@ -937,7 +937,7 @@
538
539 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
540 invoke_apply_changeset_callback (r, "C-> %s\n", no_dot (escaped_tmp));
541- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
542+ 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);
543 lim_free (0, escaped_tmp);
544 }
545 else if (arch_id_indicates_changelog (id))
546@@ -946,7 +946,7 @@
547 rel_make_record_3_taking (rel_field_ref (target_loc_field),
548 rel_field_ref (id_field),
549 rel_make_field_str (target_path)),
550- 0);
551+ rel_record_null);
552 }
553 else
554 {
555@@ -1010,7 +1010,7 @@
556 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
557 invoke_apply_changeset_callback (r, "M %s\n",
558 no_dot (escaped_tmp));
559- rel_add_records (&r->modified_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
560+ 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);
561 lim_free (0, escaped_tmp);
562 }
563 else if (patch_stat == 1)
564@@ -1024,7 +1024,7 @@
565 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
566 invoke_apply_changeset_callback (r, "C %s\n",
567 no_dot (escaped_tmp));
568- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
569+ 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);
570
571 lim_free (0, escaped_tmp);
572 lim_free (0, orig_name);
573@@ -1111,7 +1111,7 @@
574 {
575 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, mod_loc);
576 invoke_apply_changeset_callback (r, "?M %s\n", no_dot (escaped_tmp));
577- 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);
578+ 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);
579 save_patch_for_missing_file (missing_patch_dir, orig_patch_path, mod_loc);
580 save_patch_for_missing_file (missing_patch_dir, mod_patch_path, mod_loc);
581 lim_free (0, escaped_tmp);
582@@ -1151,7 +1151,7 @@
583
584 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
585 invoke_apply_changeset_callback (r, "C-> %s\n", no_dot (escaped_tmp));
586- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
587+ 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);
588
589 lim_free (0, escaped_tmp);
590 lim_free (0, orig_name);
591@@ -1213,7 +1213,7 @@
592 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
593 invoke_apply_changeset_callback (r, "M-> %s\n",
594 no_dot (escaped_tmp));
595- rel_add_records (&r->modified_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
596+ 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);
597 lim_free (0, escaped_tmp);
598 }
599 else
600@@ -1278,7 +1278,7 @@
601 {
602 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, mod_loc);
603 invoke_apply_changeset_callback (r, "?M %s\n", no_dot (escaped_tmp));
604- 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);
605+ 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);
606 save_patch_for_missing_file (missing_patch_dir, orig_patch_path, mod_loc);
607 save_patch_for_missing_file (missing_patch_dir, mod_patch_path, mod_loc);
608 lim_free (0, escaped_tmp);
609@@ -1306,7 +1306,7 @@
610
611 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
612 invoke_apply_changeset_callback (r, "Cb %s\n", no_dot (escaped_tmp));
613- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
614+ 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);
615
616 lim_free (0, escaped_tmp);
617 lim_free (0, orig_name);
618@@ -1350,7 +1350,7 @@
619 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
620 invoke_apply_changeset_callback (r, "Mb %s\n",
621 no_dot (escaped_tmp));
622- rel_add_records (&r->modified_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
623+ 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);
624 lim_free (0, escaped_tmp);
625 }
626 else
627@@ -1410,7 +1410,7 @@
628 {
629 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, mod_loc);
630 invoke_apply_changeset_callback (r, "?M %s\n", no_dot (escaped_tmp));
631- 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);
632+ 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);
633 save_patch_for_missing_file (missing_patch_dir, orig_patch_path, mod_loc);
634 save_patch_for_missing_file (missing_patch_dir, mod_patch_path, mod_loc);
635 lim_free (0, escaped_tmp);
636@@ -1438,7 +1438,7 @@
637
638 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
639 invoke_apply_changeset_callback (r, "Cch %s\n", no_dot (escaped_tmp));
640- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
641+ 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);
642
643 lim_free (0, escaped_tmp);
644 lim_free (0, orig_name);
645@@ -1487,7 +1487,7 @@
646 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
647 invoke_apply_changeset_callback (r, "ch %s\n",
648 no_dot (escaped_tmp));
649- rel_add_records (&r->modified_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
650+ 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);
651 lim_free (0, escaped_tmp);
652 }
653 else
654@@ -1550,7 +1550,7 @@
655 {
656 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, mod_loc);
657 invoke_apply_changeset_callback (r, "?M %s\n", no_dot (escaped_tmp));
658- 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);
659+ 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);
660 save_patch_for_missing_file (missing_patch_dir, orig_patch_path, mod_loc);
661 save_patch_for_missing_file (missing_patch_dir, mod_patch_path, mod_loc);
662 lim_free (0, escaped_tmp);
663@@ -1585,7 +1585,7 @@
664
665 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
666 invoke_apply_changeset_callback (r, "Cch %s\n", no_dot (escaped_tmp));
667- rel_add_records (&r->conflict_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
668+ 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);
669
670 lim_free (0, escaped_tmp);
671 lim_free (0, orig_name);
672@@ -1632,7 +1632,7 @@
673 escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, target_loc);
674 invoke_apply_changeset_callback (r, "ch %s\n",
675 no_dot (escaped_tmp));
676- rel_add_records (&r->modified_files, rel_make_record_2_taking (rel_field_ref (target_loc_field), rel_field_ref (id_field)), 0);
677+ 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);
678 lim_free (0, escaped_tmp);
679 }
680 else
681@@ -1699,7 +1699,7 @@
682 invoke_apply_changeset_callback (r, "?-- %s\n", no_dot (escaped_tmp));
683 rel_field_ref (mod_loc_field);
684 rel_field_ref (id_field);
685- rel_add_records (&r->missing_file_for_meta_patch, rel_make_record_2_taking (mod_loc_field, id_field), 0);
686+ rel_add_records (&r->missing_file_for_meta_patch, rel_make_record_2_taking (mod_loc_field, id_field), rel_record_null);
687 save_patch_for_missing_file (missing_patch_dir, orig_patch_path, mod_loc);
688 save_patch_for_missing_file (missing_patch_dir, mod_patch_path, mod_loc);
689 lim_free (0, escaped_tmp);
690@@ -1733,7 +1733,7 @@
691 invoke_apply_changeset_callback (r, "C-- %s\n", no_dot (escaped_tmp));
692 rel_field_ref (target_loc_field);
693 rel_field_ref (id_field);
694- rel_add_records (&r->metadata_conflict_files, rel_make_record_2_taking (target_loc_field, id_field), 0);
695+ rel_add_records (&r->metadata_conflict_files, rel_make_record_2_taking (target_loc_field, id_field), rel_record_null);
696
697 lim_free (0, escaped_tmp);
698 lim_free (0, rej_name);
699@@ -1806,7 +1806,7 @@
700 invoke_apply_changeset_callback (r, "-- %s\n", no_dot (escaped_tmp));
701 rel_field_ref (target_loc_field);
702 rel_field_ref (id_field);
703- rel_add_records (&r->meta_modified_files, rel_make_record_2_taking (target_loc_field, id_field), 0);
704+ rel_add_records (&r->meta_modified_files, rel_make_record_2_taking (target_loc_field, id_field), rel_record_null);
705 lim_free (0, escaped_tmp);
706 }
707
708@@ -1872,7 +1872,7 @@
709 invoke_apply_changeset_callback (r, "?-/ %s\n", no_dot (escaped_tmp));
710 rel_field_ref (mod_loc_field);
711 rel_field_ref (id_field);
712- rel_add_records (&r->missing_dir_for_meta_patch, rel_make_record_2_taking (mod_loc_field, id_field), 0);
713+ rel_add_records (&r->missing_dir_for_meta_patch, rel_make_record_2_taking (mod_loc_field, id_field), rel_record_null);
714 save_patch_for_missing_file (missing_patch_dir, orig_patch_path, mod_loc);
715 save_patch_for_missing_file (missing_patch_dir, mod_patch_path, mod_loc);
716 lim_free (0, escaped_tmp);
717@@ -1928,7 +1928,7 @@
718 invoke_apply_changeset_callback (r, "--/ %s\n", no_dot (escaped_tmp));
719 rel_field_ref (target_loc_field);
720 rel_field_ref (id_field);
721- rel_add_records (&r->meta_modified_dirs, rel_make_record_2_taking (target_loc_field, id_field), 0);
722+ rel_add_records (&r->meta_modified_dirs, rel_make_record_2_taking (target_loc_field, id_field), rel_record_null);
723 lim_free (0, escaped_tmp);
724 }
725
726@@ -2006,7 +2006,7 @@
727 invoke_apply_changeset_callback (r, "cl %s\n", no_dot (escaped_tmp));
728 rel_field_ref (target_loc_field);
729 rel_field_ref (id_field);
730- rel_add_records (&r->modified_files, rel_make_record_2_taking (target_loc_field, id_field), 0);
731+ rel_add_records (&r->modified_files, rel_make_record_2_taking (target_loc_field, id_field), rel_record_null);
732
733 rel_field_unref (target_loc_field);
734 rel_field_unref (id_field);
735@@ -2204,7 +2204,7 @@
736 rel_make_record_3_taking (rel_make_field_str (id),
737 rel_make_field_str (rel_peek_str (inv->files, y, 0) + target_loc_as_dir_len),
738 rel_get_field (inv->files, y, 1)),
739- 0);
740+ rel_record_null);
741 }
742 }
743 }
744@@ -2221,7 +2221,7 @@
745 rel_make_record_3_taking (rel_make_field_str (id),
746 rel_make_field_str (rel_peek_str (inv->dirs, y, 0) + target_loc_as_dir_len),
747 rel_get_field (inv->dirs, y, 1)),
748- 0);
749+ rel_record_null);
750 }
751 }
752 }
753@@ -2314,7 +2314,7 @@
754 {
755 conflict:
756 preserve_old_patch_spew (spew_root, target, loc);
757- rel_add_records (deferred_conflicts, rel_singleton_record_taking (rel_make_field_str (loc)), 0);
758+ rel_add_records (deferred_conflicts, rel_singleton_record_taking (rel_make_field_str (loc)), rel_record_null);
759
760 safe_rename (path, orig_path);
761 conflict_detected = 1;
762--- tla-1.3.3.orig/src/tla/libarch/pfs-dav.c
763+++ tla-1.3.3/src/tla/libarch/pfs-dav.c
764@@ -21,14 +21,14 @@
765 #include "tla/libfsutils/file-contents.h"
766 #include "tla/libarch/archives.h"
767 #include "tla/libarch/pfs-dav.h"
768-#include "libneon/src/ne_session.h"
769-#include "libneon/src/ne_basic.h"
770-#include "libneon/src/ne_request.h"
771-#include "libneon/src/ne_auth.h"
772-#include "libneon/src/ne_props.h"
773-#include "libneon/src/ne_uri.h"
774-#include "libneon/src/ne_redirect.h"
775-#include "libneon/src/ne_socket.h"
776+#include <neon/ne_session.h>
777+#include <neon/ne_basic.h>
778+#include <neon/ne_request.h>
779+#include <neon/ne_auth.h>
780+#include <neon/ne_props.h>
781+#include <neon/ne_uri.h>
782+#include <neon/ne_redirect.h>
783+#include <neon/ne_socket.h>
784
785 \f
786
787--- tla-1.3.3.orig/src/tla/libarch/import.c
788+++ tla-1.3.3/src/tla/libarch/import.c
789@@ -121,7 +121,7 @@
790
791 arch_finish_import (tree_root, arch->name, version, pristine_path, changelog_loc, full_meta);
792
793- arch_run_hook ("import", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, 0);
794+ arch_run_hook ("import", "ARCH_ARCHIVE", arch->name, "ARCH_REVISION", revision, "ARCH_TREE_ROOT", tree_root, (t_uchar*)0);
795
796 lim_free (0, revision);
797 lim_free (0, changelog_loc);
798--- tla-1.3.3.orig/src/tla/libarch/inode-sig.c
799+++ tla-1.3.3/src/tla/libarch/inode-sig.c
800@@ -343,7 +343,7 @@
801 t_uchar * signature = arch_statb_inode_sig (stat_buf);
802
803 if (!S_ISDIR (stat_buf->st_mode) && !S_ISLNK (stat_buf->st_mode))
804- rel_add_records (answer, rel_make_record_2_taking (rel_make_field_str (id), rel_make_field_str (signature)), 0);
805+ rel_add_records (answer, rel_make_record_2_taking (rel_make_field_str (id), rel_make_field_str (signature)), rel_record_null);
806 lim_free(0, signature);
807 }
808
809--- tla-1.3.3.orig/src/tla/libarch/libraries.c
810+++ tla-1.3.3/src/tla/libarch/libraries.c
811@@ -60,7 +60,7 @@
812
813 if (!safe_access (maybe_archive_dir, F_OK))
814 {
815- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_archive_dir)), 0);
816+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_archive_dir)), rel_record_null);
817 }
818
819 lim_free (0, maybe_archive_dir);
820@@ -73,7 +73,7 @@
821
822 priority_lib_dir = rel_peek_str (lib_path, 0, 0);
823 archive_dir = file_name_in_vicinity (0, priority_lib_dir, archive);
824- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (archive_dir)), 0);
825+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (archive_dir)), rel_record_null);
826
827 lim_free (0, archive_dir);
828 }
829@@ -109,7 +109,7 @@
830
831 if (!safe_access (maybe_category_dir, F_OK))
832 {
833- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_category_dir)), 0);
834+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_category_dir)), rel_record_null);
835 }
836
837 lim_free (0, maybe_category_dir);
838@@ -122,7 +122,7 @@
839
840 priority_archive_dir = rel_peek_str (archive_dirs, 0, 0);
841 category_dir = file_name_in_vicinity (0, priority_archive_dir, category);
842- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (category_dir)));
843+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (category_dir)), rel_record_null);
844
845 lim_free (0, category_dir);
846 }
847@@ -162,7 +162,7 @@
848
849 if (!safe_access (maybe_branch_dir, F_OK))
850 {
851- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_branch_dir)), 0);
852+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_branch_dir)), rel_record_null);
853 }
854
855 lim_free (0, maybe_branch_dir);
856@@ -175,7 +175,7 @@
857
858 priority_category_dir = rel_peek_str (category_dirs, 0, 0);
859 branch_dir = file_name_in_vicinity (0, priority_category_dir, branch);
860- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (branch_dir)), 0);
861+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (branch_dir)), rel_record_null);
862
863 lim_free (0, branch_dir);
864 }
865@@ -216,7 +216,7 @@
866
867 if (!safe_access (maybe_version_dir, F_OK))
868 {
869- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_version_dir)), 0);
870+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_version_dir)), rel_record_null);
871 }
872
873 lim_free (0, maybe_version_dir);
874@@ -229,7 +229,7 @@
875
876 priority_branch_dir = rel_peek_str (branch_dirs, 0, 0);
877 version_dir = file_name_in_vicinity (0, priority_branch_dir, version);
878- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (version_dir)), 0);
879+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (version_dir)), rel_record_null);
880
881 lim_free (0, version_dir);
882 }
883@@ -270,7 +270,7 @@
884
885 if (!safe_access (maybe_revision_dir, F_OK))
886 {
887- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_revision_dir)), 0);
888+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (maybe_revision_dir)), rel_record_null);
889 }
890
891 lim_free (0, maybe_revision_dir);
892@@ -283,7 +283,7 @@
893
894 priority_version_dir = rel_peek_str (version_dirs, 0, 0);
895 revision_dir = file_name_in_vicinity (0, priority_version_dir, revision);
896- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (revision_dir)), 0);
897+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (revision_dir)), rel_record_null);
898
899 lim_free (0, revision_dir);
900 }
901--- tla-1.3.3.orig/src/tla/libarch/pristines.c
902+++ tla-1.3.3/src/tla/libarch/pristines.c
903@@ -282,7 +282,7 @@
904
905 if (category)
906 {
907- rel_add_records (&maybe_categories, rel_singleton_record_taking (rel_make_field_str (category)), 0);
908+ rel_add_records (&maybe_categories, rel_singleton_record_taking (rel_make_field_str (category)), rel_record_null);
909 }
910 else
911 {
912@@ -303,7 +303,7 @@
913
914 if (branch)
915 {
916- rel_add_records (&maybe_branches, rel_singleton_record_taking (rel_make_field_str (branch)), 0);
917+ rel_add_records (&maybe_branches, rel_singleton_record_taking (rel_make_field_str (branch)), rel_record_null);
918 }
919 else
920 {
921@@ -323,7 +323,7 @@
922
923 if (version)
924 {
925- rel_add_records (&maybe_versions, rel_singleton_record_taking (rel_make_field_str (version)), 0);
926+ rel_add_records (&maybe_versions, rel_singleton_record_taking (rel_make_field_str (version)), rel_record_null);
927 }
928 else
929 {
930@@ -342,7 +342,7 @@
931
932 if (archive_limit)
933 {
934- rel_add_records (&maybe_archives, rel_singleton_record_taking (rel_make_field_str (archive_limit)), 0);
935+ rel_add_records (&maybe_archives, rel_singleton_record_taking (rel_make_field_str (archive_limit)), rel_record_null);
936 }
937 else
938 {
939@@ -360,7 +360,7 @@
940
941 if (revision)
942 {
943- rel_add_records (&maybe_revisions, rel_singleton_record_taking (rel_make_field_str (revision)), 0);
944+ rel_add_records (&maybe_revisions, rel_singleton_record_taking (rel_make_field_str (revision)), rel_record_null);
945 }
946 else
947 {
948@@ -375,7 +375,7 @@
949 t_uchar * fqr = 0;
950
951 fqr = arch_fully_qualify (rel_peek_str (maybe_archives, a, 0), rel_peek_str (maybe_revisions, r, 0));
952- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (fqr)), 0);
953+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (fqr)), rel_record_null);
954 lim_free (0, fqr);
955 }
956 }
957@@ -490,7 +490,7 @@
958
959 if (!vu_lstat (&ign, path, &stat_buf) && S_ISDIR (stat_buf.st_mode))
960 {
961- rel_add_records (&sibling_paths, rel_singleton_record_taking (rel_make_field_str (path)), 0);
962+ rel_add_records (&sibling_paths, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
963 }
964 lim_free (0, path);
965 }
966--- tla-1.3.3.orig/src/tla/libarch/invent.c
967+++ tla-1.3.3/src/tla/libarch/invent.c
968@@ -170,7 +170,7 @@
969 {
970 rel_table * answer = (rel_table *)closure;
971
972- rel_add_records (answer, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), 0);
973+ rel_add_records (answer, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), rel_record_null);
974 }
975
976
977@@ -186,7 +186,7 @@
978 rel_table * answer = (rel_table *)closure;
979
980 if (!S_ISDIR (statb->st_mode))
981- rel_add_records (answer, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), 0);
982+ rel_add_records (answer, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), rel_record_null);
983 }
984
985
986--- tla-1.3.3.orig/src/tla/libarch/cmd.h
987+++ tla-1.3.3/src/tla/libarch/cmd.h
988@@ -21,6 +21,7 @@
989 \f
990 /* automatically generated __STDC__ prototypes */
991 extern int arch_call_cmd (arch_cmd_fn fn, t_uchar * prog_name, ...);
992+ /* must terminate list with (char*)0, NOT 0 or NULL ! */
993 #endif /* INCLUDE__LIBARCH__CMD_H */
994
995 \f
996--- tla-1.3.3.orig/src/tla/libarch/cmd-changes.c
997+++ tla-1.3.3/src/tla/libarch/cmd-changes.c
998@@ -287,7 +287,7 @@
999
1000 while (argc > argn)
1001 {
1002- rel_add_records (&limits, rel_singleton_record_taking (rel_make_field_str (argv[argn])), 0);
1003+ rel_add_records (&limits, rel_singleton_record_taking (rel_make_field_str (argv[argn])), rel_record_null);
1004 ++argn;
1005 }
1006 }
1007--- tla-1.3.3.orig/src/tla/libarch/configs.c
1008+++ tla-1.3.3/src/tla/libarch/configs.c
1009@@ -122,7 +122,7 @@
1010 exit (2);
1011 }
1012
1013- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (loc), rel_make_field_str (rev)), 0);
1014+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (loc), rel_make_field_str (rev)), rel_record_null);
1015
1016 lim_free (0, loc);
1017 lim_free (0, rev);
1018@@ -188,7 +188,7 @@
1019 else
1020 fqr = arch_fully_qualify (archive, version);
1021
1022- rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (config_in, x, 0), rel_make_field_str (fqr)), 0);
1023+ rel_add_records (&answer, rel_make_record_2_taking (rel_get_field (config_in, x, 0), rel_make_field_str (fqr)), rel_record_null);
1024
1025 lim_free (0, subtree_path_spec);
1026 lim_free (0, subtree_path);
1027--- tla-1.3.3.orig/src/tla/libarch/hooks.h
1028+++ tla-1.3.3/src/tla/libarch/hooks.h
1029@@ -17,6 +17,7 @@
1030 \f
1031 /* automatically generated __STDC__ prototypes */
1032 extern int arch_run_hook (t_uchar * name, ...);
1033+ /* must terminate list with (t_uchar*)0, NOT 0 or NULL ! */
1034 #endif /* INCLUDE__LIBARCH__HOOKS_H */
1035
1036 \f
1037--- tla-1.3.3.orig/src/tla/libarch/cmd-id.c
1038+++ tla-1.3.3/src/tla/libarch/cmd-id.c
1039@@ -75,7 +75,6 @@
1040 struct opt_parsed * option;
1041 int silent;
1042 enum arch_id_tagging_method method;
1043- t_uchar * answer;
1044 int escape_classes = arch_escape_classes;
1045
1046 safe_buffer_fd (1, 0, O_WRONLY, 0);
1047@@ -131,36 +130,45 @@
1048 }
1049 }
1050
1051- if (argc != 2)
1052+ if (argc < 2)
1053 goto usage_error;
1054
1055- answer = arch_inventory_id (method, 0, argv[1], 0, 0, 0);
1056+ {
1057+ int a;
1058
1059- if (!answer)
1060- {
1061- if (!silent)
1062- {
1063- t_uchar * escaped_tmp;
1064- escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, argv[1]);
1065- safe_printfmt (2, "\n");
1066- safe_printfmt (2, "%s: untagged file\n", argv[0]);
1067- safe_printfmt (2, " %s\n", escaped_tmp);
1068- safe_printfmt (2, "\n");
1069- lim_free (0, escaped_tmp);
1070- }
1071- exit (1);
1072- }
1073- else
1074- {
1075- if (!silent)
1076- {
1077- t_uchar * escaped_tmp;
1078- escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, argv[1]);
1079- safe_printfmt (1, "%s\t%s\n", escaped_tmp, answer);
1080- lim_free (0, escaped_tmp);
1081- }
1082- exit (0);
1083- }
1084+ for (a = 1; a < argc; ++a)
1085+ {
1086+ t_uchar * answer;
1087+
1088+ answer = arch_inventory_id (method, 0, argv[a], 0, 0, 0);
1089+
1090+ if (!answer)
1091+ {
1092+ if (!silent)
1093+ {
1094+ t_uchar * escaped_tmp;
1095+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, argv[a]);
1096+ safe_printfmt (2, "\n");
1097+ safe_printfmt (2, "%s: untagged file\n", argv[0]);
1098+ safe_printfmt (2, " %s\n", escaped_tmp);
1099+ safe_printfmt (2, "\n");
1100+ lim_free (0, escaped_tmp);
1101+ }
1102+ exit (1);
1103+ }
1104+ else
1105+ {
1106+ if (!silent)
1107+ {
1108+ t_uchar * escaped_tmp;
1109+ escaped_tmp = pika_save_escape_iso8859_1 (0, 0, escape_classes, argv[a]);
1110+ safe_printfmt (1, "%s\t%s\n", escaped_tmp, answer);
1111+ lim_free (0, escaped_tmp);
1112+ }
1113+ lim_free (0, answer);
1114+ }
1115+ }
1116+ }
1117
1118 return 0;
1119 }
1120--- tla-1.3.3.orig/src/tla/libarch/ancestry.c
1121+++ tla-1.3.3/src/tla/libarch/ancestry.c
1122@@ -44,7 +44,7 @@
1123
1124 if (!this_arch)
1125 {
1126- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_make_field_str ("???")), 0);
1127+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_make_field_str ("???")), rel_record_null);
1128 done = 1;
1129 }
1130 else
1131@@ -52,7 +52,7 @@
1132 t_uchar * ancestor = 0;
1133
1134 if (!merges)
1135- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_make_field_str (fq_rev)), 0);
1136+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_make_field_str (fq_rev)), rel_record_null);
1137 else
1138 {
1139 enum arch_revision_type type;
1140@@ -61,7 +61,7 @@
1141
1142 if (type == arch_continuation_revision)
1143 {
1144- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_make_field_str (fq_rev)), 0);
1145+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_make_field_str (fq_rev)), rel_record_null);
1146 }
1147 else
1148 {
1149@@ -71,7 +71,7 @@
1150 merges = arch_archive_merge_points (this_arch, revision, 0, 0, 0);
1151 for (x = 0; x < rel_n_records (merges); ++x)
1152 {
1153- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_get_field (merges, x, 1)), 0);
1154+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (fq_rev), rel_get_field (merges, x, 1)), rel_record_null);
1155 }
1156 rel_free_table (merges);
1157 }
1158--- tla-1.3.3.orig/src/tla/libarch/make-changeset.c
1159+++ tla-1.3.3/src/tla/libarch/make-changeset.c
1160@@ -280,7 +280,7 @@
1161
1162 spec_loc = str_alloc_cat_many (0, ".", spec_dir_abs + mod_root_length, "/", spec_tail, str_end);
1163
1164- rel_add_records (&lim_spec_locs, rel_singleton_record_taking (rel_make_field_str (spec_loc)), 0);
1165+ rel_add_records (&lim_spec_locs, rel_singleton_record_taking (rel_make_field_str (spec_loc)), rel_record_null);
1166
1167 lim_free (0, spec_dir);
1168 lim_free (0, spec_tail);
1169@@ -306,7 +306,7 @@
1170 }
1171 }
1172 if (!dont_want)
1173- rel_add_records (&limits, rel_singleton_record_taking (rel_get_field (lim_spec_locs, l, 0)), 0);
1174+ rel_add_records (&limits, rel_singleton_record_taking (rel_get_field (lim_spec_locs, l, 0)), rel_record_null);
1175 }
1176
1177 rel_sort_table_by_field (0, limits, 0);
1178@@ -339,7 +339,7 @@
1179 rel_add_records (&orig_full_index,
1180 rel_make_record_2_taking (rel_make_field_str ("."),
1181 rel_make_field_str ("?_.")),
1182- 0);
1183+ rel_record_null);
1184 rel_sort_table_by_field (0, orig_full_index, 1);
1185
1186 mod_full_index = rel_copy_table (report->mod_index.dirs);
1187@@ -347,7 +347,7 @@
1188 rel_add_records (&mod_full_index,
1189 rel_make_record_2_taking (rel_make_field_str ("."),
1190 rel_make_field_str ("?_.")),
1191- 0);
1192+ rel_record_null);
1193 rel_sort_table_by_field (0, mod_full_index, 1);
1194
1195 mod_full_index_by_name = rel_copy_table (mod_full_index);
1196@@ -742,7 +742,7 @@
1197 lim = rel_n_records (renamed_dirs);
1198 for (x = 0; x < lim; ++x)
1199 {
1200- rel_add_records (&report->renamed_dirs, rel_copy_record (rel_peek_record (renamed_dirs, x)), 0);
1201+ rel_add_records (&report->renamed_dirs, rel_copy_record (rel_peek_record (renamed_dirs, x)), rel_record_null);
1202 if (report->callback)
1203 {
1204 t_uchar * escape_tmp0;
1205@@ -759,7 +759,7 @@
1206 lim = rel_n_records (renamed_files);
1207 for (x = 0; x < lim; ++x)
1208 {
1209- rel_add_records (&report->renamed_files, rel_copy_record (rel_peek_record (renamed_files, x)), 0);
1210+ rel_add_records (&report->renamed_files, rel_copy_record (rel_peek_record (renamed_files, x)), rel_record_null);
1211 if (report->callback)
1212 {
1213 t_uchar * escape_tmp0;
1214@@ -973,7 +973,7 @@
1215 */
1216 rel_add_records (&report->mod_files_index,
1217 rel_make_record_2_taking (rel_make_field_str (mod_loc), rel_make_field_str (id)),
1218- 0);
1219+ rel_record_null);
1220 rel_sort_table_by_field (0, report->mod_files_index, 0);
1221 rel_uniq_by_field (&report->mod_files_index, 0);
1222
1223@@ -981,7 +981,7 @@
1224 rel_make_record_3_taking (rel_make_field_str (mod_loc),
1225 rel_make_field_str (id),
1226 rel_make_field_str (new_file_path)),
1227- 0);
1228+ rel_record_null);
1229 rel_sort_table_by_field (0, report->added_files, 0);
1230 rel_uniq_by_field (&report->added_files, 0);
1231
1232@@ -993,11 +993,11 @@
1233 rel_add_records (&make_report->mod_index.files,
1234 rel_make_record_2_taking (rel_make_field_str (mod_loc),
1235 rel_make_field_str (id)),
1236- 0);
1237+ rel_record_null);
1238 rel_sort_table_by_field (0, make_report->mod_index.files, 1);
1239 rel_uniq_by_field (&make_report->mod_index.files, 1);
1240
1241- rel_add_records (&make_report->added_files, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1242+ rel_add_records (&make_report->added_files, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1243 rel_sort_table_by_field (0, make_report->added_files, 0);
1244 rel_uniq_by_field (&make_report->added_files, 0);
1245
1246@@ -1051,13 +1051,13 @@
1247 {
1248 rel_add_records (&report->mod_files_index,
1249 rel_make_record_2_taking (rel_make_field_str (mod_loc), rel_make_field_str (id)),
1250- 0);
1251+ rel_record_null);
1252 rel_sort_table_by_field (0, report->mod_files_index, 0);
1253 rel_uniq_by_field (&report->mod_files_index, 0);
1254
1255 rel_add_records (&report->orig_files_index,
1256 rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (id)),
1257- 0);
1258+ rel_record_null);
1259 rel_sort_table_by_field (0, report->orig_files_index, 0);
1260 rel_uniq_by_field (&report->orig_files_index, 0);
1261
1262@@ -1065,7 +1065,7 @@
1263 rel_make_record_3_taking (rel_make_field_str (mod_loc),
1264 rel_make_field_str (id),
1265 rel_make_field_str (patch_path)),
1266- 0);
1267+ rel_record_null);
1268 rel_sort_table_by_field (0, report->patched_regular_files, 0);
1269 rel_uniq_by_field (&report->patched_regular_files, 0);
1270 }
1271@@ -1081,21 +1081,21 @@
1272 rel_add_records (&make_report->mod_index.files,
1273 rel_make_record_2_taking (rel_make_field_str (mod_loc),
1274 rel_make_field_str (id)),
1275- 0);
1276+ rel_record_null);
1277 rel_sort_table_by_field (0, make_report->mod_index.files, 1);
1278 rel_uniq_by_field (&make_report->mod_index.files, 1);
1279
1280 rel_add_records (&make_report->orig_index.files,
1281 rel_make_record_2_taking (rel_make_field_str (orig_loc),
1282 rel_make_field_str (id)),
1283- 0);
1284+ rel_record_null);
1285 rel_sort_table_by_field (0, make_report->orig_index.files, 1);
1286 rel_uniq_by_field (&make_report->orig_index.files, 1);
1287
1288 rel_add_records (&make_report->modified_files,
1289 rel_make_record_2_taking (rel_make_field_str (orig_loc),
1290 rel_make_field_str (mod_loc)),
1291- 0);
1292+ rel_record_null);
1293 rel_sort_table_by_field (0, make_report->modified_files, 0);
1294 rel_uniq_by_field (&make_report->modified_files, 0);
1295
1296@@ -1199,7 +1199,7 @@
1297 {
1298 rel_add_records (out,
1299 rel_make_record_2_taking (rel_field_ref (orig_field), rel_get_field (X_index, x, 0)),
1300- 0);
1301+ rel_record_null);
1302 }
1303
1304 rel_field_unref (id_field);
1305@@ -1350,12 +1350,12 @@
1306 int orig_patch_fd;
1307 int mod_patch_fd;
1308
1309- rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), 0);
1310- rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1311+ rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), rel_record_null);
1312+ rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1313
1314 if (report)
1315 {
1316- rel_add_records (&report->perms_changed_dirs, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), 0);
1317+ rel_add_records (&report->perms_changed_dirs, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), rel_record_null);
1318 if (report->callback)
1319 {
1320 t_uchar * escape_tmp;
1321@@ -1448,12 +1448,12 @@
1322 int orig_out_fd;
1323 int mod_out_fd;
1324
1325- rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), 0);
1326- rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1327+ rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), rel_record_null);
1328+ rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1329
1330 if (report)
1331 {
1332- rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), 0);
1333+ rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), rel_record_null);
1334 if (report->callback)
1335 {
1336 t_uchar * escape_tmp;
1337@@ -1495,12 +1495,12 @@
1338 t_uchar * patch_dir;
1339 int orig_out_fd;
1340
1341- rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), 0);
1342- rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1343+ rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), rel_record_null);
1344+ rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1345
1346 if (report)
1347 {
1348- rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), 0);
1349+ rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), rel_record_null);
1350 if (report->callback)
1351 {
1352 t_uchar * escape_tmp;
1353@@ -1542,12 +1542,12 @@
1354 t_uchar * patch_dir;
1355 int mod_out_fd;
1356
1357- rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), 0);
1358- rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1359+ rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), rel_record_null);
1360+ rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1361
1362 if (report)
1363 {
1364- rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), 0);
1365+ rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), rel_record_null);
1366 if (report->callback)
1367 {
1368 t_uchar * escape_tmp;
1369@@ -1626,12 +1626,12 @@
1370 int orig_meta_fd;
1371 int mod_meta_fd;
1372
1373- rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), 0);
1374- rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1375+ rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), rel_record_null);
1376+ rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1377
1378 if (report)
1379 {
1380- rel_add_records (&report->perms_changed_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), 0);
1381+ rel_add_records (&report->perms_changed_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), rel_record_null);
1382 if (report->callback)
1383 {
1384 t_uchar * escape_tmp;
1385@@ -1717,12 +1717,12 @@
1386 case 1:
1387 {
1388
1389- rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), 0);
1390- rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1391+ rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), rel_record_null);
1392+ rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1393
1394 if (report)
1395 {
1396- rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), 0);
1397+ rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), rel_record_null);
1398 if (report->callback)
1399 {
1400 t_uchar * escape_tmp;
1401@@ -1744,12 +1744,12 @@
1402 t_uchar * orig_copy;
1403 t_uchar * mod_copy;
1404
1405- rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), 0);
1406- rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), 0);
1407+ rel_add_records (orig_index_names_output, rel_singleton_record_taking (rel_make_field_str (orig_loc)), rel_record_null);
1408+ rel_add_records (mod_index_names_output, rel_singleton_record_taking (rel_make_field_str (mod_loc)), rel_record_null);
1409
1410 if (report)
1411 {
1412- rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), 0);
1413+ rel_add_records (&report->modified_files, rel_make_record_2_taking (rel_make_field_str (orig_loc), rel_make_field_str (mod_loc)), rel_record_null);
1414 if (report->callback)
1415 {
1416 t_uchar * escape_tmp;
1417@@ -1966,12 +1966,12 @@
1418
1419 if (!added_orig && !assoc_get_str_taking (*orig_has_dir_id, rel_field_ref (container_id_field)) && assoc_get_str_taking (orig_dir_loc_of, rel_field_ref (container_id_field)))
1420 {
1421- rel_add_records (added_orig_container_ids, rel_singleton_record_taking (rel_field_ref (container_id_field)), 0);
1422+ rel_add_records (added_orig_container_ids, rel_singleton_record_taking (rel_field_ref (container_id_field)), rel_record_null);
1423 added_orig = 1;
1424 }
1425 if (!added_mod && !assoc_get_str_taking (*mod_has_dir_id, rel_field_ref (container_id_field)) && assoc_get_str_taking (mod_dir_loc_of, rel_field_ref (container_id_field)))
1426 {
1427- rel_add_records (added_mod_container_ids, rel_singleton_record_taking (rel_field_ref (container_id_field)), 0);
1428+ rel_add_records (added_mod_container_ids, rel_singleton_record_taking (rel_field_ref (container_id_field)), rel_record_null);
1429 added_mod = 1;
1430 }
1431
1432@@ -2006,7 +2006,7 @@
1433 rel_field deep_loc_field;
1434
1435 deep_loc_field = assoc_get_taking (dir_loc_of, rel_make_field_str (deep_id));
1436- rel_add_records (locs_out, rel_singleton_record_taking (rel_field_ref (deep_loc_field)), 0);
1437+ rel_add_records (locs_out, rel_singleton_record_taking (rel_field_ref (deep_loc_field)), rel_record_null);
1438 assoc_set_taking (has_ids, rel_make_field_str (deep_id), rel_field_ref (deep_loc_field));
1439
1440 rel_field_unref (deep_loc_field);
1441--- tla-1.3.3.orig/src/tla/libarch/changeset-utils.c
1442+++ tla-1.3.3/src/tla/libarch/changeset-utils.c
1443@@ -165,7 +165,7 @@
1444 exit (2);
1445 }
1446
1447- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (loc), rel_make_field_str (id)), 0);
1448+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (loc), rel_make_field_str (id)), rel_record_null);
1449 lim_free (0, loc);
1450 lim_free (0, id);
1451 }
1452@@ -266,7 +266,7 @@
1453 exit (2);
1454 }
1455
1456- rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (loc), rel_make_field_str (perms)), 0);
1457+ rel_add_records (&answer, rel_make_record_2_taking (rel_make_field_str (loc), rel_make_field_str (perms)), rel_record_null);
1458
1459 lim_free (0, perms);
1460 lim_free (0, loc);
1461@@ -465,9 +465,9 @@
1462
1463
1464 if (S_ISDIR (stat_buf->st_mode))
1465- rel_add_records (&index->dirs, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), 0);
1466+ rel_add_records (&index->dirs, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), rel_record_null);
1467 else
1468- rel_add_records (&index->files, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), 0);
1469+ rel_add_records (&index->files, rel_make_record_2_taking (rel_make_field_str (path), rel_make_field_str (id)), rel_record_null);
1470 }
1471
1472
1473--- tla-1.3.3.orig/src/tla/libarch/cmd-abrowse.c
1474+++ tla-1.3.3/src/tla/libarch/cmd-abrowse.c
1475@@ -410,7 +410,7 @@
1476 {
1477 level = arch_parse_package_name (arch_ret_patch_level, 0, rev);
1478 assoc_set_taking (&since_limits, rel_make_field_str (version), rel_make_field_str (level));
1479- rel_add_records (&old_since_limits, rel_make_record_2_taking (rel_make_field_str (version), rel_make_field_str (level)), 0);
1480+ rel_add_records (&old_since_limits, rel_make_record_2_taking (rel_make_field_str (version), rel_make_field_str (level)), rel_record_null);
1481 }
1482
1483 if (since_limits_opt)
1484@@ -550,7 +550,7 @@
1485 rel_add_records (&new_since_limits,
1486 rel_make_record_2_taking (rel_get_field (versions, v, 0),
1487 rel_get_field (revisions, 0, 0)),
1488- 0);
1489+ rel_record_null);
1490 }
1491 else
1492 {
1493@@ -558,7 +558,7 @@
1494 rel_add_records (&new_since_limits,
1495 rel_make_record_2_taking (rel_get_field (versions, v, 0),
1496 rel_get_field (revisions, rel_n_records (revisions) - 1, 0)),
1497- 0);
1498+ rel_record_null);
1499 }
1500
1501 for (r = 0; r < rel_n_records (revisions); ++r)
1502--- tla-1.3.3.orig/src/tla/libarch/pfs-sftp.c
1503+++ tla-1.3.3/src/tla/libarch/pfs-sftp.c
1504@@ -230,7 +230,7 @@
1505 while (*fmt)
1506 switch (*fmt++)
1507 {
1508- case '8': /* int64 */
1509+ case '8': /* unsigned long long */
1510 ll = va_arg (ap, unsigned long long);
1511 len += sizeof (ll);
1512 buf = lim_realloc (0, buf, len);
1513@@ -238,7 +238,7 @@
1514 i += sizeof (ll);
1515 break;
1516
1517- case '4': /* int32 */
1518+ case '4': /* t_uint32 */
1519 l = va_arg (ap, t_uint32);
1520 len += sizeof (l);
1521 buf = lim_realloc (0, buf, len);
1522@@ -246,7 +246,7 @@
1523 i += sizeof (l);
1524 break;
1525
1526- case '1': /* int8 */
1527+ case '1': /* int */
1528 c = va_arg (ap, int);
1529 len += sizeof (c);
1530 buf = lim_realloc (0, buf, len);
1531@@ -254,9 +254,9 @@
1532 i += sizeof (c);
1533 break;
1534
1535- case 's': /* string (IE: <int32:length> <string>) */
1536+ case 's': /* char*,size_t (IE: <int32:length> <string>) */
1537 s = va_arg (ap, char *);
1538- l = va_arg (ap, int);
1539+ l = va_arg (ap, size_t);
1540 len += sizeof (l) + l;
1541 buf = lim_realloc (0, buf, len);
1542 WRITE_UINT4 (buf + i, l);
1543@@ -265,7 +265,7 @@
1544 i += l;
1545 break;
1546
1547- case 'a': /* attributes */
1548+ case 'a': /* struct sftp_attrs* */
1549 attrs = va_arg (ap, struct sftp_attrs *);
1550 sftp_export_attrs (attrs, &s, &s_len);
1551 len += s_len;
1552@@ -468,7 +468,8 @@
1553 int pkt_len;
1554 char *pkt;
1555
1556- sftp_write_pkt (p, soft_errors, "14", SSH_FXP_INIT, SFTP_VERSION, soft_errors);
1557+ sftp_write_pkt (p, soft_errors, "14", SSH_FXP_INIT,
1558+ (t_uint32)SFTP_VERSION, soft_errors);
1559 sftp_server_response (p, &pkt, &pkt_len, SSH_FXP_VERSION, soft_errors);
1560
1561 lim_free (0, pkt);
1562@@ -653,7 +654,8 @@
1563 attrs.flags = 0;
1564 ret = sftp_write_pkt (p, soft_errors,
1565 "14s4a", SSH_FXP_OPEN, ++p->request_id,
1566- file, str_length (file), SSH_FXF_READ, &attrs);
1567+ file, str_length (file),
1568+ (t_uint32)SSH_FXF_READ, &attrs);
1569 lim_free (0, file);
1570
1571 if (0 > ret)
1572@@ -689,9 +691,9 @@
1573 for (; ! eof && p->plreqs <= MIN(MAX_PL_REQS, numpkts + 1); p->plreqs++)
1574 {
1575 ret = sftp_write_pkt (p, soft_errors, "14s84", SSH_FXP_READ,
1576- ++p->request_id, handle, handle_len,
1577+ ++p->request_id, handle, (size_t)handle_len,
1578 total_read + SFTP_RWSIZE * p->plreqs,
1579- SFTP_RWSIZE);
1580+ (t_uint32)SFTP_RWSIZE);
1581 if (0 > ret)
1582 {
1583 lim_free (0, handle);
1584@@ -765,7 +767,7 @@
1585
1586 if (0 > sftp_write_pkt (p, soft_errors,
1587 "14s", SSH_FXP_CLOSE, ++p->request_id,
1588- handle, handle_len))
1589+ handle, (size_t)handle_len))
1590 return -1;
1591
1592 lim_free (0, handle);
1593@@ -876,7 +878,7 @@
1594 {
1595 if (0 >sftp_write_pkt (pfs, soft_errors,
1596 "14s", SSH_FXP_READDIR, ++pfs->request_id,
1597- handle, handle_len))
1598+ handle, (size_t)handle_len))
1599 return rel_table_nil;
1600
1601 if (0 > (i = sftp_server_response (pfs, &pkt, &pkt_len, SSH_FXP_NAME,
1602@@ -915,7 +917,7 @@
1603 if (!dots)
1604 {
1605 file = str_save_n (0, pkt+i, len);
1606- rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), 0);
1607+ rel_add_records (&answer, rel_singleton_record_taking (rel_make_field_str (file)), rel_record_null);
1608 }
1609
1610 i += len;
1611@@ -945,7 +947,7 @@
1612
1613 if (0 > sftp_write_pkt (pfs, soft_errors,
1614 "14s", SSH_FXP_CLOSE, ++pfs->request_id,
1615- handle, handle_len))
1616+ handle, (size_t)handle_len))
1617 return rel_table_nil;
1618 lim_free (0, handle);
1619
1620@@ -1057,7 +1059,9 @@
1621 ret = sftp_write_pkt (pfs, soft_errors,
1622 "14s4a", SSH_FXP_OPEN, ++pfs->request_id, file,
1623 str_length (file),
1624- SSH_FXF_WRITE | SSH_FXF_CREAT | SSH_FXF_TRUNC, &attrs);
1625+ (t_uint32)(SSH_FXF_WRITE | SSH_FXF_CREAT |
1626+ SSH_FXF_TRUNC),
1627+ &attrs);
1628 lim_free (0, file);
1629
1630 if (0 > ret)
1631@@ -1102,9 +1106,9 @@
1632 }
1633
1634 ret = sftp_write_pkt (pfs, soft_errors, "14s8s", SSH_FXP_WRITE,
1635- ++pfs->request_id, handle, handle_len,
1636+ ++pfs->request_id, handle, (size_t)handle_len,
1637 total_written + pfs->plreqs * sizeof (buf),
1638- buf, len);
1639+ buf, (size_t)len);
1640 if (0 > ret)
1641 {
1642 lim_free (0, handle);
1643@@ -1144,7 +1148,7 @@
1644
1645 ret = sftp_write_pkt (pfs, soft_errors,
1646 "14s", SSH_FXP_CLOSE, ++pfs->request_id, handle,
1647- handle_len);
1648+ (size_t)handle_len);
1649 lim_free (0, handle);
1650
1651 if (0 > ret)
1652--- tla-1.3.3.orig/src/tla/libarch/local-cache.c
1653+++ tla-1.3.3/src/tla/libarch/local-cache.c
1654@@ -70,7 +70,7 @@
1655 error = arch_run_hook (hook,
1656 "ARCH_ARCHIVE", archive,
1657 "ARCH_REVISION", revision,
1658- 0);
1659+ (t_uchar*)0);
1660
1661 if (error)
1662 {
1663--- tla-1.3.3.orig/src/tla/libarch/missing.c
1664+++ tla-1.3.3/src/tla/libarch/missing.c
1665@@ -124,7 +124,7 @@
1666 log = arch_archive_log (arch, revision);
1667
1668 if (is_a_patch_present(has, log))
1669- rel_add_records (&to_skip, rel_copy_record (rel_peek_record (unfiltered, x)), 0);
1670+ rel_add_records (&to_skip, rel_copy_record (rel_peek_record (unfiltered, x)), rel_record_null);
1671 lim_free (0, revision);
1672 }
1673 rel_free_table (has);
1674--- tla-1.3.3.orig/src/tla/libarch/cmd-update.c
1675+++ tla-1.3.3/src/tla/libarch/cmd-update.c
1676@@ -324,7 +324,8 @@
1677 safe_printfmt (1, "* setting aside local changes temporarily\n");
1678 safe_flush (1);
1679 arch_call_cmd (arch_cmd_undo, argv[0], "-A", archive, "-d", dest, ancestor_rev,
1680- (escape_classes == 0) ? "--unescaped" : 0, 0);
1681+ (escape_classes == 0) ? "--unescaped" : (char*)0,
1682+ (char*)0);
1683
1684 safe_printfmt (1, "* updating for new patches in archive\n");
1685 safe_flush (1);
1686@@ -333,12 +334,13 @@
1687 /* could be fancy here and binary search for local copies :-)
1688 */
1689 arch_call_cmd (arch_cmd_replay, argv[0], "--new", "-A", archive, "--dir", dest, version,
1690- (escape_classes == 0) ? "--unescaped" : 0, 0);
1691+ (escape_classes == 0) ? "--unescaped" : (char*)0,
1692+ (char*)0);
1693 }
1694 else
1695 {
1696 arch_call_cmd (arch_cmd_apply_delta, argv[0], "-A", archive, "--dir", dest, ancestor_rev,
1697- latest_rev, (escape_classes == 0) ? "--unescaped" : 0, 0);
1698+ latest_rev, (escape_classes == 0) ? "--unescaped" : (char*)0, (char*)0);
1699 }
1700
1701 safe_printfmt (1, "* reapplying local changes\n");
1702@@ -346,10 +348,10 @@
1703
1704 if (!forward)
1705 arch_call_cmd (arch_cmd_redo, argv[0], "-d", dest,
1706- (escape_classes == 0) ? "--unescaped" : 0, 0);
1707+ (escape_classes == 0) ? "--unescaped" : (char*)0, (char*)0);
1708 else
1709 arch_call_cmd (arch_cmd_redo, argv[0], "--forward", "-d", dest,
1710- (escape_classes == 0) ? "--unescaped" : 0, 0);
1711+ (escape_classes == 0) ? "--unescaped" : (char*)0, (char*)0);
1712
1713
1714 lim_free (0, ancestor_rev);
1715--- tla-1.3.3.orig/src/tla/libarch/merge-points.c
1716+++ tla-1.3.3/src/tla/libarch/merge-points.c
1717@@ -48,7 +48,7 @@
1718 path = arch_log_file (tree_root, into_archive, into_spec);
1719 level = arch_parse_package_name (arch_ret_patch_level, 0, into_spec);
1720
1721- rel_add_records (&source_logs, rel_make_record_2_taking (rel_make_field_str (into_spec), rel_make_field_str (path)), 0);
1722+ rel_add_records (&source_logs, rel_make_record_2_taking (rel_make_field_str (into_spec), rel_make_field_str (path)), rel_record_null);
1723
1724 lim_free (0, path);
1725 lim_free (0, level);
1726@@ -96,7 +96,7 @@
1727 if (arch_valid_package_name (into_spec, arch_no_archive, arch_req_patch_level, 0))
1728 {
1729 if (!upto)
1730- rel_add_records (&source_revisions, rel_singleton_record_taking (rel_make_field_str (into_spec)), 0);
1731+ rel_add_records (&source_revisions, rel_singleton_record_taking (rel_make_field_str (into_spec)), rel_record_null);
1732 else
1733 {
1734 t_uchar * into_version = 0;
1735@@ -106,7 +106,7 @@
1736 all_source_revisions = arch_archive_revisions (into_arch, into_version, 2);
1737 for (x = 0; x < rel_n_records (all_source_revisions); ++x)
1738 {
1739- rel_add_records (&source_revisions, rel_copy_record (rel_peek_record (all_source_revisions, x)), 0);
1740+ rel_add_records (&source_revisions, rel_copy_record (rel_peek_record (all_source_revisions, x)), rel_record_null);
1741 if (!str_cmp (rel_peek_str (all_source_revisions, x, 0), into_spec))
1742 break;
1743 }
1744@@ -201,7 +201,7 @@
1745 for (x = 0; x < rel_n_records (new_patches); ++x)
1746 {
1747 if (!str_cmp_prefix (prefix, rel_peek_str (new_patches, x, 0)))
1748- rel_add_records (out, rel_make_record_2_taking (rel_make_field_str (level), rel_get_field (new_patches, x, 0)), 0);
1749+ rel_add_records (out, rel_make_record_2_taking (rel_make_field_str (level), rel_get_field (new_patches, x, 0)), rel_record_null);
1750 }
1751
1752 free_assoc_table (headers);
1753--- tla-1.3.3.orig/src/tla/libarch/proj-tree-lint.c
1754+++ tla-1.3.3/src/tla/libarch/proj-tree-lint.c
1755@@ -267,7 +267,7 @@
1756 for (i = 0; i < n_records; ++i)
1757 {
1758 if (hashtree_find (id_map, hash_key (rel_peek_str (explicit_ids, i, 0)), (void *)rel_peek_str (explicit_ids, i, 0), tree_lint_hashtree_rules) == 0)
1759- rel_add_records (ids_sans_files, rel_singleton_record_taking (rel_get_field (explicit_ids, i, 1)), 0);
1760+ rel_add_records (ids_sans_files, rel_singleton_record_taking (rel_get_field (explicit_ids, i, 1)), rel_record_null);
1761 }
1762 }
1763
1764@@ -308,14 +308,14 @@
1765 */
1766 if (category == arch_inventory_unrecognized)
1767 {
1768- rel_add_records (&thunk->answer->unrecognized_files, rel_singleton_record_taking (rel_make_field_str (path)), 0);
1769+ rel_add_records (&thunk->answer->unrecognized_files, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
1770 }
1771
1772 /* files classified as non-source because they lack an inventory id
1773 */
1774 if ((category != arch_inventory_source) && has_source_name)
1775 {
1776- rel_add_records (&thunk->answer->warning_files, rel_singleton_record_taking (rel_make_field_str (path)), 0);
1777+ rel_add_records (&thunk->answer->warning_files, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
1778 }
1779
1780
1781@@ -325,7 +325,7 @@
1782 {
1783 if (safe_access (path, F_OK))
1784 {
1785- rel_add_records (&thunk->answer->symlinks_sans_targets, rel_singleton_record_taking (rel_make_field_str (path)), 0);
1786+ rel_add_records (&thunk->answer->symlinks_sans_targets, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
1787 }
1788 }
1789
1790@@ -336,7 +336,7 @@
1791 && (category == arch_inventory_source)
1792 && (!id || (id[0] == '?')))
1793 {
1794- rel_add_records (&thunk->answer->untagged_files, rel_singleton_record_taking (rel_make_field_str (path)), 0);
1795+ rel_add_records (&thunk->answer->untagged_files, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
1796 }
1797 else if ((thunk->options->method == arch_explicit_id_tagging) && (category == arch_inventory_source) && !id)
1798 {
1799@@ -344,7 +344,7 @@
1800
1801 dir = file_name_directory_file (0, path);
1802 if (!arch_is_dont_care_explicit_dflt_dir (dir))
1803- rel_add_records (&thunk->answer->untagged_files, rel_singleton_record_taking (rel_make_field_str (path)), 0);
1804+ rel_add_records (&thunk->answer->untagged_files, rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
1805 lim_free (0, dir);
1806 }
1807
1808@@ -380,7 +380,7 @@
1809 safe_printfmt (2, "i/o error during inventory traversal (%s) for %s\n", errno_to_string (errn), file);
1810 exit (2);
1811 }
1812- rel_add_records (&thunk->explicit_ids, rel_make_record_2_taking (rel_make_field_str (id), rel_make_field_str (path)), 0);
1813+ rel_add_records (&thunk->explicit_ids, rel_make_record_2_taking (rel_make_field_str (id), rel_make_field_str (path)), rel_record_null);
1814 lim_free (0, id);
1815 }
1816 lim_free (0, path_dir);
1817@@ -419,10 +419,10 @@
1818 {
1819 *(rel_table *)ar_push ((void **)&thunk->answer->duplicate_id_groups, 0, sizeof (rel_table)) = rel_table_nil;
1820 binding->index = ar_size ((void *)thunk->answer->duplicate_id_groups, 0, sizeof (rel_table)) - 1;
1821- rel_add_records (&thunk->answer->duplicate_id_groups[binding->index], rel_make_record_2_taking (rel_make_field_str (binding->first_occurence), rel_make_field_str (id)), 0);
1822+ rel_add_records (&thunk->answer->duplicate_id_groups[binding->index], rel_make_record_2_taking (rel_make_field_str (binding->first_occurence), rel_make_field_str (id)), rel_record_null);
1823 }
1824
1825- rel_add_records (&thunk->answer->duplicate_id_groups[binding->index], rel_singleton_record_taking (rel_make_field_str (path)), 0);
1826+ rel_add_records (&thunk->answer->duplicate_id_groups[binding->index], rel_singleton_record_taking (rel_make_field_str (path)), rel_record_null);
1827 }
1828
1829
1830--- tla-1.3.3.orig/src/tla/libarch/cmd-apply-delta.c
1831+++ tla-1.3.3/src/tla/libarch/cmd-apply-delta.c
1832@@ -223,13 +223,13 @@
1833 if (cache_dir)
1834 arch_call_cmd (arch_cmd_delta, argv[0],
1835 "--cache", cache_dir, "-A", default_archive, from_spec, to_spec, changeset,
1836- ((escape_classes == 0) ? "--unescaped" : 0),
1837- 0);
1838+ ((escape_classes == 0) ? "--unescaped" : (char*)0),
1839+ (char*)0);
1840 else
1841 arch_call_cmd (arch_cmd_delta, argv[0],
1842 "-A", default_archive, from_spec, to_spec, changeset,
1843- ((escape_classes == 0) ? "--unescaped" : 0),
1844- 0);
1845+ ((escape_classes == 0) ? "--unescaped" : (char*)0),
1846+ (char*)0);
1847
1848 {
1849 struct arch_apply_changeset_report r = {0, };
1850--- tla-1.3.3.orig/src/tla/libarch/archive.c
1851+++ tla-1.3.3/src/tla/libarch/archive.c
1852@@ -77,7 +77,7 @@
1853
1854 arch_pfs_make_archive (name, location, version, mirror_of, dot_listing_lossage, signed_archive);
1855
1856- arch_run_hook ("make-archive", "ARCH_ARCHIVE", name, "ARCH_LOCATION", location, 0);
1857+ arch_run_hook ("make-archive", "ARCH_ARCHIVE", name, "ARCH_LOCATION", location, (t_uchar*)0);
1858
1859 lim_free (0, version);
1860 }
1861@@ -590,7 +590,7 @@
1862
1863 ensure_writable (arch, 0);
1864 answer = arch->vtable->make_category (errstr, arch, category);
1865- arch_run_hook ("make-category", "ARCH_ARCHIVE", arch->name, "ARCH_CATEGORY", category, 0);
1866+ arch_run_hook ("make-category", "ARCH_ARCHIVE", arch->name, "ARCH_CATEGORY", category, (t_uchar*)0);
1867 return answer;
1868 }
1869
1870@@ -603,7 +603,7 @@
1871
1872 ensure_writable (arch, 0);
1873 answer = arch->vtable->make_branch (errstr, arch, branch);
1874- arch_run_hook ("make-branch", "ARCH_ARCHIVE", arch->name, "ARCH_BRANCH", branch, 0);
1875+ arch_run_hook ("make-branch", "ARCH_ARCHIVE", arch->name, "ARCH_BRANCH", branch, (t_uchar*)0);
1876 return answer;
1877 }
1878
1879@@ -616,7 +616,7 @@
1880
1881 ensure_writable (arch, 0);
1882 answer = arch->vtable->make_version (errstr, arch, version);
1883- arch_run_hook ("make-version", "ARCH_ARCHIVE", arch->name, "ARCH_VERSION", version, 0);
1884+ arch_run_hook ("make-version", "ARCH_ARCHIVE", arch->name, "ARCH_VERSION", version, (t_uchar*)0);
1885 return answer;
1886 }
1887
1888--- tla-1.3.3.orig/src/tla/libarch/my.c
1889+++ tla-1.3.3/src/tla/libarch/my.c
1890@@ -488,7 +488,7 @@
1891 */
1892 if (dir_spec && (op == arch_library_first))
1893 {
1894- rel_add_records (&new_path, rel_singleton_record_taking (rel_make_field_str (dir)), 0);
1895+ rel_add_records (&new_path, rel_singleton_record_taking (rel_make_field_str (dir)), rel_record_null);
1896 }
1897
1898 /* copy the old path, removing dir_spec (if any)
1899@@ -501,7 +501,7 @@
1900 {
1901 if (str_cmp (rel_peek_str (old_path, x, 0), dir))
1902 {
1903- rel_add_records (&new_path, rel_singleton_record_taking (rel_get_field (old_path, x, 0)), 0);
1904+ rel_add_records (&new_path, rel_singleton_record_taking (rel_get_field (old_path, x, 0)), rel_record_null);
1905 }
1906 }
1907 }
1908@@ -510,7 +510,7 @@
1909 */
1910 if (dir_spec && (op == arch_library_last))
1911 {
1912- rel_add_records (&new_path, rel_singleton_record_taking (rel_make_field_str (dir)), 0);
1913+ rel_add_records (&new_path, rel_singleton_record_taking (rel_make_field_str (dir)), rel_record_null);
1914 }
1915
1916
1917--- tla-1.3.3.orig/src/tla/libarch/changeset-report.c
1918+++ tla-1.3.3/src/tla/libarch/changeset-report.c
1919@@ -295,7 +295,7 @@
1920 rel_make_record_3_taking (rel_make_field_str (patch_file_loc),
1921 rel_field_ref (id_field),
1922 rel_make_field_str (patch_file_path)),
1923- 0);
1924+ rel_record_null);
1925 }
1926
1927 rel_field_unref (id_field);
1928@@ -875,7 +875,7 @@
1929 rel_make_record_3_taking (rel_get_field (index, x, 0),
1930 rel_get_field (index, x, 1),
1931 rel_make_field_str (archive_path)),
1932- 0);
1933+ rel_record_null);
1934 }
1935 else
1936 {
1937@@ -883,7 +883,7 @@
1938 rel_make_record_3_taking (rel_get_field (index, x, 0),
1939 rel_get_field (index, x, 1),
1940 rel_make_field_str (archive_path)),
1941- 0);
1942+ rel_record_null);
1943 }
1944
1945 lim_free (0, archive_path);
1946@@ -954,7 +954,7 @@
1947 rel_add_records (out, rel_make_record_3_taking (orig_loc_field,
1948 mod_loc_field,
1949 id_field),
1950- 0);
1951+ rel_record_null);
1952 }
1953
1954
tla arch - revision control system
This page took 0.382487 seconds and 4 git commands to generate.