summaryrefslogtreecommitdiff
path: root/xdelta1/libedsio
diff options
context:
space:
mode:
Diffstat (limited to 'xdelta1/libedsio')
-rw-r--r--xdelta1/libedsio/Makefile56
-rwxr-xr-xxdelta1/libedsio/Makefile.in434
-rwxr-xr-xxdelta1/libedsio/default.c4
-rwxr-xr-xxdelta1/libedsio/edsio-comp4
-rwxr-xr-xxdelta1/libedsio/edsio.c2
-rwxr-xr-xxdelta1/libedsio/edsio.el2
-rwxr-xr-xxdelta1/libedsio/edsio.el.flc2
-rwxr-xr-xxdelta1/libedsio/edsio.h4
-rwxr-xr-xxdelta1/libedsio/edsio.prj40
-rwxr-xr-xxdelta1/libedsio/edsio_edsio.c67
10 files changed, 46 insertions, 569 deletions
diff --git a/xdelta1/libedsio/Makefile b/xdelta1/libedsio/Makefile
index 6048ffe..d8a042c 100644
--- a/xdelta1/libedsio/Makefile
+++ b/xdelta1/libedsio/Makefile
@@ -1,7 +1,6 @@
1# Generated automatically from Makefile.in by configure. 1# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
2# Makefile.in generated automatically by automake 1.4 from Makefile.am
3 2
4# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. 3# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
5# This Makefile.in is free software; the Free Software Foundation 4# This Makefile.in is free software; the Free Software Foundation
6# gives unlimited permission to copy and/or distribute it, 5# gives unlimited permission to copy and/or distribute it,
7# with or without modifications, as long as this notice is preserved. 6# with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,7 @@ SHELL = /bin/sh
16 15
17srcdir = . 16srcdir = .
18top_srcdir = .. 17top_srcdir = ..
18
19prefix = /usr/local 19prefix = /usr/local
20exec_prefix = ${prefix} 20exec_prefix = ${prefix}
21 21
@@ -40,15 +40,15 @@ pkgincludedir = $(includedir)/xdelta
40 40
41top_builddir = .. 41top_builddir = ..
42 42
43ACLOCAL = aclocal 43ACLOCAL = aclocal-1.4
44AUTOCONF = autoconf 44AUTOCONF = autoconf
45AUTOMAKE = automake 45AUTOMAKE = automake-1.4
46AUTOHEADER = autoheader 46AUTOHEADER = autoheader
47 47
48INSTALL = /usr/bin/install -c 48INSTALL = /usr/bin/install -c
49INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) 49INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
50INSTALL_DATA = ${INSTALL} -m 644 50INSTALL_DATA = ${INSTALL} -m 644
51INSTALL_SCRIPT = ${INSTALL_PROGRAM} 51INSTALL_SCRIPT = ${INSTALL}
52transform = s,x,x, 52transform = s,x,x,
53 53
54NORMAL_INSTALL = : 54NORMAL_INSTALL = :
@@ -57,27 +57,40 @@ POST_INSTALL = :
57NORMAL_UNINSTALL = : 57NORMAL_UNINSTALL = :
58PRE_UNINSTALL = : 58PRE_UNINSTALL = :
59POST_UNINSTALL = : 59POST_UNINSTALL = :
60host_alias = i686-pc-linux-gnu 60host_alias =
61host_triplet = i686-pc-linux-gnu 61host_triplet = i686-pc-linux-gnu
62AR = ar
62AS = @AS@ 63AS = @AS@
63CC = gcc 64CC = gcc-4.1.1
64CPP = gcc -E 65CPP = gcc-4.1.1 -E
66CXX = g++
67CXXCPP = g++ -E
65DLLTOOL = @DLLTOOL@ 68DLLTOOL = @DLLTOOL@
66EMACS = /usr/bin/xemacs 69ECHO = echo
70EGREP = grep -E
71EMACS = /usr/bin/emacs
72EXEEXT =
73F77 = g77
74GCJ = @GCJ@
75GCJFLAGS = @GCJFLAGS@
67GLIB_CFLAGS = -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include 76GLIB_CFLAGS = -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
68GLIB_CONFIG = /usr/local/bin/glib-config 77GLIB_CONFIG = /usr/local/bin/glib-config
69GLIB_LIBS = -L/usr/local/lib -lglib 78GLIB_LIBS = -L/usr/local/lib -lglib
70LD = /usr/i586-pc-linux-gnu/bin/ld 79HAVE_LIB = @HAVE_LIB@
80LIB = @LIB@
71LIBTOOL = $(SHELL) $(top_builddir)/libtool 81LIBTOOL = $(SHELL) $(top_builddir)/libtool
72LN_S = ln 82LN_S = ln
83LTLIB = @LTLIB@
73MAINT = # 84MAINT = #
74MAKEINFO = makeinfo 85MAKEINFO = makeinfo
75NM = /usr/bin/nm -B
76OBJDUMP = @OBJDUMP@ 86OBJDUMP = @OBJDUMP@
87OBJEXT = o
77PACKAGE = xdelta 88PACKAGE = xdelta
78RANLIB = ranlib 89RANLIB = ranlib
79VERSION = 1.1.3 90RC = @RC@
80top_srcdir_absolute = /mnt/polaroid/Polaroid/orbit_linux/home/jmacd/projects/xdelta11 91STRIP = strip
92VERSION = 1.1.4
93top_srcdir_absolute = /mnt/polaroid/Polaroid/orbit_linux/home/jmacd/projects/xdelta1
81 94
82INCLUDES = $(GLIB_CFLAGS) 95INCLUDES = $(GLIB_CFLAGS)
83 96
@@ -120,9 +133,10 @@ libedsio_la_DEPENDENCIES =
120libedsio_la_OBJECTS = library.lo simple.lo edsio.lo edsio_edsio.lo \ 133libedsio_la_OBJECTS = library.lo simple.lo edsio.lo edsio_edsio.lo \
121sha.lo md5c.lo fh.lo generic.lo default.lo base64.lo maketime.lo \ 134sha.lo md5c.lo fh.lo generic.lo default.lo base64.lo maketime.lo \
122partime.lo 135partime.lo
136noinst_PROGRAMS = edsiotest$(EXEEXT)
123PROGRAMS = $(noinst_PROGRAMS) 137PROGRAMS = $(noinst_PROGRAMS)
124 138
125edsiotest_OBJECTS = edsiotest.o 139edsiotest_OBJECTS = edsiotest.$(OBJEXT)
126edsiotest_DEPENDENCIES = libedsio.la 140edsiotest_DEPENDENCIES = libedsio.la
127edsiotest_LDFLAGS = 141edsiotest_LDFLAGS =
128SCRIPTS = $(noinst_SCRIPTS) 142SCRIPTS = $(noinst_SCRIPTS)
@@ -150,7 +164,7 @@ OBJECTS = $(libedsio_la_OBJECTS) $(edsiotest_OBJECTS)
150 164
151all: all-redirect 165all: all-redirect
152.SUFFIXES: 166.SUFFIXES:
153.SUFFIXES: .S .c .lo .o .s 167.SUFFIXES: .S .c .lo .o .obj .s
154$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 168$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
155 cd $(top_srcdir) && $(AUTOMAKE) --gnu libedsio/Makefile 169 cd $(top_srcdir) && $(AUTOMAKE) --gnu libedsio/Makefile
156 170
@@ -186,6 +200,11 @@ uninstall-libLTLIBRARIES:
186 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ 200 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
187 done 201 done
188 202
203# FIXME: We should only use cygpath when building on Windows,
204# and only if it is available.
205.c.obj:
206 $(COMPILE) -c `cygpath -w $<`
207
189.s.o: 208.s.o:
190 $(COMPILE) -c $< 209 $(COMPILE) -c $<
191 210
@@ -194,6 +213,7 @@ uninstall-libLTLIBRARIES:
194 213
195mostlyclean-compile: 214mostlyclean-compile:
196 -rm -f *.o core *.core 215 -rm -f *.o core *.core
216 -rm -f *.$(OBJEXT)
197 217
198clean-compile: 218clean-compile:
199 219
@@ -230,8 +250,8 @@ distclean-noinstPROGRAMS:
230 250
231maintainer-clean-noinstPROGRAMS: 251maintainer-clean-noinstPROGRAMS:
232 252
233edsiotest: $(edsiotest_OBJECTS) $(edsiotest_DEPENDENCIES) 253edsiotest$(EXEEXT): $(edsiotest_OBJECTS) $(edsiotest_DEPENDENCIES)
234 @rm -f edsiotest 254 @rm -f edsiotest$(EXEEXT)
235 $(LINK) $(edsiotest_LDFLAGS) $(edsiotest_OBJECTS) $(edsiotest_LDADD) $(LIBS) 255 $(LINK) $(edsiotest_LDFLAGS) $(edsiotest_OBJECTS) $(edsiotest_LDADD) $(LIBS)
236 256
237install-includeHEADERS: $(include_HEADERS) 257install-includeHEADERS: $(include_HEADERS)
diff --git a/xdelta1/libedsio/Makefile.in b/xdelta1/libedsio/Makefile.in
deleted file mode 100755
index b4be8b7..0000000
--- a/xdelta1/libedsio/Makefile.in
+++ /dev/null
@@ -1,434 +0,0 @@
1# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
2
3# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
4# This Makefile.in is free software; the Free Software Foundation
5# gives unlimited permission to copy and/or distribute it,
6# with or without modifications, as long as this notice is preserved.
7
8# This program is distributed in the hope that it will be useful,
9# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
10# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11# PARTICULAR PURPOSE.
12
13
14SHELL = @SHELL@
15
16srcdir = @srcdir@
17top_srcdir = @top_srcdir@
18VPATH = @srcdir@
19prefix = @prefix@
20exec_prefix = @exec_prefix@
21
22bindir = @bindir@
23sbindir = @sbindir@
24libexecdir = @libexecdir@
25datadir = @datadir@
26sysconfdir = @sysconfdir@
27sharedstatedir = @sharedstatedir@
28localstatedir = @localstatedir@
29libdir = @libdir@
30infodir = @infodir@
31mandir = @mandir@
32includedir = @includedir@
33oldincludedir = /usr/include
34
35DESTDIR =
36
37pkgdatadir = $(datadir)/@PACKAGE@
38pkglibdir = $(libdir)/@PACKAGE@
39pkgincludedir = $(includedir)/@PACKAGE@
40
41top_builddir = ..
42
43ACLOCAL = @ACLOCAL@
44AUTOCONF = @AUTOCONF@
45AUTOMAKE = @AUTOMAKE@
46AUTOHEADER = @AUTOHEADER@
47
48INSTALL = @INSTALL@
49INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
50INSTALL_DATA = @INSTALL_DATA@
51INSTALL_SCRIPT = @INSTALL_SCRIPT@
52transform = @program_transform_name@
53
54NORMAL_INSTALL = :
55PRE_INSTALL = :
56POST_INSTALL = :
57NORMAL_UNINSTALL = :
58PRE_UNINSTALL = :
59POST_UNINSTALL = :
60host_alias = @host_alias@
61host_triplet = @host@
62AS = @AS@
63CC = @CC@
64CPP = @CPP@
65DLLTOOL = @DLLTOOL@
66EMACS = @EMACS@
67GLIB_CFLAGS = @GLIB_CFLAGS@
68GLIB_CONFIG = @GLIB_CONFIG@
69GLIB_LIBS = @GLIB_LIBS@
70LD = @LD@
71LIBTOOL = @LIBTOOL@
72LN_S = @LN_S@
73MAINT = @MAINT@
74MAKEINFO = @MAKEINFO@
75NM = @NM@
76OBJDUMP = @OBJDUMP@
77PACKAGE = @PACKAGE@
78RANLIB = @RANLIB@
79VERSION = @VERSION@
80top_srcdir_absolute = @top_srcdir_absolute@
81
82INCLUDES = $(GLIB_CFLAGS)
83
84noinst_SCRIPTS = edsio-comp
85
86lib_LTLIBRARIES = libedsio.la
87
88noinst_PROGRAMS = edsiotest
89
90edsiotest_SOURCES = edsiotest.c
91
92edsiotest_LDADD = libedsio.la $(GLIB_LIBS)
93
94noinst_HEADERS = maketime.h partime.h
95
96include_HEADERS = edsio.h edsio_edsio.h
97
98libedsio_la_LIBADD = $(GLIB_LIBS)
99
100libedsio_la_SOURCES = library.c simple.c edsio.c edsio_edsio.c sha.c md5c.c fh.c generic.c default.c base64.c maketime.c partime.c
101
102
103EXTRA_DIST = edsio.el edsio.ser $(SER_OUT1) edsio-comp.in edsio.prj stamp-ser1
104
105SER_OUT1 = edsio_edsio.c edsio_edsio.h
106
107BUILT_SOURCES = edsio_edsio.c
108mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
109CONFIG_HEADER = ../config.h
110CONFIG_CLEAN_FILES = edsio-comp
111LTLIBRARIES = $(lib_LTLIBRARIES)
112
113
114DEFS = @DEFS@ -I. -I$(srcdir) -I..
115CPPFLAGS = @CPPFLAGS@
116LDFLAGS = @LDFLAGS@
117LIBS = @LIBS@
118libedsio_la_LDFLAGS =
119libedsio_la_DEPENDENCIES =
120libedsio_la_OBJECTS = library.lo simple.lo edsio.lo edsio_edsio.lo \
121sha.lo md5c.lo fh.lo generic.lo default.lo base64.lo maketime.lo \
122partime.lo
123PROGRAMS = $(noinst_PROGRAMS)
124
125edsiotest_OBJECTS = edsiotest.o
126edsiotest_DEPENDENCIES = libedsio.la
127edsiotest_LDFLAGS =
128SCRIPTS = $(noinst_SCRIPTS)
129
130CFLAGS = @CFLAGS@
131COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
132LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
133CCLD = $(CC)
134LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
135HEADERS = $(include_HEADERS) $(noinst_HEADERS)
136
137DIST_COMMON = Makefile.am Makefile.in edsio-comp.in
138
139
140DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
141
142TAR = tar
143GZIP_ENV = --best
144DEP_FILES = .deps/base64.P .deps/default.P .deps/edsio.P \
145.deps/edsio_edsio.P .deps/edsiotest.P .deps/fh.P .deps/generic.P \
146.deps/library.P .deps/maketime.P .deps/md5c.P .deps/partime.P \
147.deps/sha.P .deps/simple.P
148SOURCES = $(libedsio_la_SOURCES) $(edsiotest_SOURCES)
149OBJECTS = $(libedsio_la_OBJECTS) $(edsiotest_OBJECTS)
150
151all: all-redirect
152.SUFFIXES:
153.SUFFIXES: .S .c .lo .o .s
154$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
155 cd $(top_srcdir) && $(AUTOMAKE) --gnu libedsio/Makefile
156
157Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
158 cd $(top_builddir) \
159 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
160
161edsio-comp: $(top_builddir)/config.status edsio-comp.in
162 cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
163
164mostlyclean-libLTLIBRARIES:
165
166clean-libLTLIBRARIES:
167 -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
168
169distclean-libLTLIBRARIES:
170
171maintainer-clean-libLTLIBRARIES:
172
173install-libLTLIBRARIES: $(lib_LTLIBRARIES)
174 @$(NORMAL_INSTALL)
175 $(mkinstalldirs) $(DESTDIR)$(libdir)
176 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
177 if test -f $$p; then \
178 echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
179 $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
180 else :; fi; \
181 done
182
183uninstall-libLTLIBRARIES:
184 @$(NORMAL_UNINSTALL)
185 list='$(lib_LTLIBRARIES)'; for p in $$list; do \
186 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
187 done
188
189.s.o:
190 $(COMPILE) -c $<
191
192.S.o:
193 $(COMPILE) -c $<
194
195mostlyclean-compile:
196 -rm -f *.o core *.core
197
198clean-compile:
199
200distclean-compile:
201 -rm -f *.tab.c
202
203maintainer-clean-compile:
204
205.s.lo:
206 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
207
208.S.lo:
209 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
210
211mostlyclean-libtool:
212 -rm -f *.lo
213
214clean-libtool:
215 -rm -rf .libs _libs
216
217distclean-libtool:
218
219maintainer-clean-libtool:
220
221libedsio.la: $(libedsio_la_OBJECTS) $(libedsio_la_DEPENDENCIES)
222 $(LINK) -rpath $(libdir) $(libedsio_la_LDFLAGS) $(libedsio_la_OBJECTS) $(libedsio_la_LIBADD) $(LIBS)
223
224mostlyclean-noinstPROGRAMS:
225
226clean-noinstPROGRAMS:
227 -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
228
229distclean-noinstPROGRAMS:
230
231maintainer-clean-noinstPROGRAMS:
232
233edsiotest: $(edsiotest_OBJECTS) $(edsiotest_DEPENDENCIES)
234 @rm -f edsiotest
235 $(LINK) $(edsiotest_LDFLAGS) $(edsiotest_OBJECTS) $(edsiotest_LDADD) $(LIBS)
236
237install-includeHEADERS: $(include_HEADERS)
238 @$(NORMAL_INSTALL)
239 $(mkinstalldirs) $(DESTDIR)$(includedir)
240 @list='$(include_HEADERS)'; for p in $$list; do \
241 if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
242 echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
243 $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
244 done
245
246uninstall-includeHEADERS:
247 @$(NORMAL_UNINSTALL)
248 list='$(include_HEADERS)'; for p in $$list; do \
249 rm -f $(DESTDIR)$(includedir)/$$p; \
250 done
251
252tags: TAGS
253
254ID: $(HEADERS) $(SOURCES) $(LISP)
255 list='$(SOURCES) $(HEADERS)'; \
256 unique=`for i in $$list; do echo $$i; done | \
257 awk ' { files[$$0] = 1; } \
258 END { for (i in files) print i; }'`; \
259 here=`pwd` && cd $(srcdir) \
260 && mkid -f$$here/ID $$unique $(LISP)
261
262TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
263 tags=; \
264 here=`pwd`; \
265 list='$(SOURCES) $(HEADERS)'; \
266 unique=`for i in $$list; do echo $$i; done | \
267 awk ' { files[$$0] = 1; } \
268 END { for (i in files) print i; }'`; \
269 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
270 || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
271
272mostlyclean-tags:
273
274clean-tags:
275
276distclean-tags:
277 -rm -f TAGS ID
278
279maintainer-clean-tags:
280
281distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
282
283subdir = libedsio
284
285distdir: $(DISTFILES)
286 here=`cd $(top_builddir) && pwd`; \
287 top_distdir=`cd $(top_distdir) && pwd`; \
288 distdir=`cd $(distdir) && pwd`; \
289 cd $(top_srcdir) \
290 && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu libedsio/Makefile
291 @for file in $(DISTFILES); do \
292 d=$(srcdir); \
293 if test -d $$d/$$file; then \
294 cp -pr $$d/$$file $(distdir)/$$file; \
295 else \
296 test -f $(distdir)/$$file \
297 || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
298 || cp -p $$d/$$file $(distdir)/$$file || :; \
299 fi; \
300 done
301
302DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
303
304-include $(DEP_FILES)
305
306mostlyclean-depend:
307
308clean-depend:
309
310distclean-depend:
311 -rm -rf .deps
312
313maintainer-clean-depend:
314
315%.o: %.c
316 @echo '$(COMPILE) -c $<'; \
317 $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
318 @-cp .deps/$(*F).pp .deps/$(*F).P; \
319 tr ' ' '\012' < .deps/$(*F).pp \
320 | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
321 >> .deps/$(*F).P; \
322 rm .deps/$(*F).pp
323
324%.lo: %.c
325 @echo '$(LTCOMPILE) -c $<'; \
326 $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
327 @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
328 < .deps/$(*F).pp > .deps/$(*F).P; \
329 tr ' ' '\012' < .deps/$(*F).pp \
330 | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
331 >> .deps/$(*F).P; \
332 rm -f .deps/$(*F).pp
333info-am:
334info: info-am
335dvi-am:
336dvi: dvi-am
337check-am: all-am
338check: check-am
339installcheck-am:
340installcheck: installcheck-am
341install-exec-am: install-libLTLIBRARIES
342install-exec: install-exec-am
343
344install-data-am: install-includeHEADERS
345install-data: install-data-am
346
347install-am: all-am
348 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
349install: install-am
350uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
351uninstall: uninstall-am
352all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
353all-redirect: all-am
354install-strip:
355 $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
356installdirs:
357 $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
358
359
360mostlyclean-generic:
361
362clean-generic:
363
364distclean-generic:
365 -rm -f Makefile $(CONFIG_CLEAN_FILES)
366 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
367
368maintainer-clean-generic:
369 -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
370mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
371 mostlyclean-libtool mostlyclean-noinstPROGRAMS \
372 mostlyclean-tags mostlyclean-depend mostlyclean-generic
373
374mostlyclean: mostlyclean-am
375
376clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \
377 clean-noinstPROGRAMS clean-tags clean-depend \
378 clean-generic mostlyclean-am
379
380clean: clean-am
381
382distclean-am: distclean-libLTLIBRARIES distclean-compile \
383 distclean-libtool distclean-noinstPROGRAMS \
384 distclean-tags distclean-depend distclean-generic \
385 clean-am
386 -rm -f libtool
387
388distclean: distclean-am
389
390maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
391 maintainer-clean-compile maintainer-clean-libtool \
392 maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
393 maintainer-clean-depend maintainer-clean-generic \
394 distclean-am
395 @echo "This command is intended for maintainers to use;"
396 @echo "it deletes files that may require special tools to rebuild."
397
398maintainer-clean: maintainer-clean-am
399
400.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
401clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
402uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
403distclean-compile clean-compile maintainer-clean-compile \
404mostlyclean-libtool distclean-libtool clean-libtool \
405maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
406distclean-noinstPROGRAMS clean-noinstPROGRAMS \
407maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \
408install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
409maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
410clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
411check-am installcheck-am installcheck install-exec-am install-exec \
412install-data-am install-data install-am install uninstall-am uninstall \
413all-redirect all-am all installdirs mostlyclean-generic \
414distclean-generic clean-generic maintainer-clean-generic clean \
415mostlyclean distclean maintainer-clean
416
417
418#
419# Rules for the generated code
420#
421
422stamp-ser1: $(top_srcdir)/libedsio/edsio.el edsio.ser
423 $(top_srcdir)/libedsio/edsio-comp edsio.ser
424 touch stamp-ser1
425
426$(SER_OUT1): stamp-ser1
427
428#
429#
430#
431
432# Tell versions [3.59,3.63) of GNU make to not export all variables.
433# Otherwise a system limit (for SysV at least) may be exceeded.
434.NOEXPORT:
diff --git a/xdelta1/libedsio/default.c b/xdelta1/libedsio/default.c
index 737b07b..53f47cd 100755
--- a/xdelta1/libedsio/default.c
+++ b/xdelta1/libedsio/default.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15static gboolean 15static gboolean
16sink_type_default (SerialSink* sink, SerialType type, guint len, gboolean set_allocation) 16sink_type_default (SerialSink* sink, SerialType type, guint32 len, gboolean set_allocation)
17{ 17{
18 if (! sink->next_uint32 (sink, type)) 18 if (! sink->next_uint32 (sink, type))
19 return FALSE; 19 return FALSE;
@@ -104,7 +104,7 @@ void
104serializeio_sink_init (SerialSink* it, 104serializeio_sink_init (SerialSink* it,
105 gboolean (* sink_type) (SerialSink* sink, 105 gboolean (* sink_type) (SerialSink* sink,
106 SerialType type, 106 SerialType type,
107 guint mem_size, 107 guint32 mem_size,
108 gboolean set_allocation), 108 gboolean set_allocation),
109 gboolean (* sink_close) (SerialSink* sink), 109 gboolean (* sink_close) (SerialSink* sink),
110 gboolean (* sink_write) (SerialSink* sink, 110 gboolean (* sink_write) (SerialSink* sink,
diff --git a/xdelta1/libedsio/edsio-comp b/xdelta1/libedsio/edsio-comp
index a4dd4a6..ab9e638 100755
--- a/xdelta1/libedsio/edsio-comp
+++ b/xdelta1/libedsio/edsio-comp
@@ -19,8 +19,8 @@
19# along with this program; if not, write to the Free Software 19# along with this program; if not, write to the Free Software
20# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 20# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21 21
22EMACS=/usr/bin/xemacs 22EMACS=/usr/bin/emacs
23TOP_SRCDIR=/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/projects/xdelta11/libedsio 23TOP_SRCDIR=/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/projects/xdelta1/libedsio
24 24
25SCRIPT=$TMPDIR/script.$$ 25SCRIPT=$TMPDIR/script.$$
26 26
diff --git a/xdelta1/libedsio/edsio.c b/xdelta1/libedsio/edsio.c
index 78b259b..74fd7b3 100755
--- a/xdelta1/libedsio/edsio.c
+++ b/xdelta1/libedsio/edsio.c
@@ -504,7 +504,7 @@ edsio_md5_hash (gconstpointer v)
504 guint x = 0; 504 guint x = 0;
505 gint i, j; 505 gint i, j;
506 506
507 for (i = 0, j = 0; i < 16; i += 1, j += 1, j %= sizeof (guint)) 507 for (i = 0, j = 0; i < 16; i += 1, j += 1, j %= sizeof (guint32))
508 x ^= md5[i] << (8*j); 508 x ^= md5[i] << (8*j);
509 509
510 return x; 510 return x;
diff --git a/xdelta1/libedsio/edsio.el b/xdelta1/libedsio/edsio.el
index a8dfe64..58c3a4e 100755
--- a/xdelta1/libedsio/edsio.el
+++ b/xdelta1/libedsio/edsio.el
@@ -1257,7 +1257,7 @@ replacement is as for replace-regexp."
1257%s for (i = 0; i < %s_len; i += 1) 1257%s for (i = 0; i < %s_len; i += 1)
1258%s { 1258%s {
1259%s print_spaces (indent_spaces); 1259%s print_spaces (indent_spaces);
1260%s g_print (\"%%d:\n\", i); 1260%s g_print (\"%%d:\\n\", i);
1261%s%s } 1261%s%s }
1262%s} 1262%s}
1263" 1263"
diff --git a/xdelta1/libedsio/edsio.el.flc b/xdelta1/libedsio/edsio.el.flc
deleted file mode 100755
index ee2c72f..0000000
--- a/xdelta1/libedsio/edsio.el.flc
+++ /dev/null
@@ -1,2 +0,0 @@
1
2(fast-lock-cache-data 3 (quote (15141 . 35224)) (quote nil) (quote nil) (quote (t ("(\\(def\\(\\(advice\\|varalias\\|alias\\|generic\\|macro\\*?\\|method\\|setf\\|subst\\*?\\|un\\*?\\|ine-\\(condition\\|\\(?:derived\\|minor\\)-mode\\|method-combination\\|setf-expander\\|skeleton\\|widget\\|function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|\\(const\\(ant\\)?\\|custom\\|face\\|parameter\\|var\\)\\|\\(class\\|group\\|theme\\|package\\|struct\\|type\\)\\)\\)\\>[ '(]*\\(setf[ ]+\\sw+)\\|\\sw+\\)?" (1 font-lock-keyword-face) (9 (cond ((match-beginning 3) font-lock-function-name-face) ((match-beginning 6) font-lock-variable-name-face) (t font-lock-type-face)) nil t)) ("^;;;###\\(autoload\\)" (1 font-lock-warning-face prepend)) ("(\\(cond\\(?:ition-case\\)?\\|eval-\\(?:a\\(?:fter-load\\|nd-compile\\)\\|when\\(?:-compile\\)?\\)\\|i\\(?:f\\|nline\\)\\|l\\(?:ambda\\|et\\*?\\)\\|prog[*12nv]?\\|save-\\(?:current-buffer\\|excursion\\|match-data\\|restriction\\|selected-window\\|window-excursion\\)\\|track-mouse\\|unwind-protect\\|w\\(?:hile\\|ith-\\(?:current-buffer\\|electric-help\\|output-to-\\(?:string\\|temp-buffer\\)\\|t\\(?:emp-\\(?:buffer\\|\\(?:fil\\|messag\\)e\\)\\|imeout\\)\\)\\)\\)\\>" (1 font-lock-keyword-face)) ("(\\(b\\(?:\\(?:loc\\|rea\\)k\\)\\|c\\(?:ase\\|case\\|error\\|ompiler-let\\|typecase\\)\\|d\\(?:e\\(?:cla\\(?:im\\|re\\)\\|structuring-bind\\)\\|o\\(?:\\*\\|list\\|times\\)?\\)\\|e\\(?:\\(?:type\\)?case\\)\\|flet\\|handler-\\(?:bind\\|case\\)\\|i\\(?:gnore-errors\\|n-package\\)\\|l\\(?:abels\\|exical-let\\*?\\|o\\(?:cally\\|op\\)\\)\\|macrolet\\|proclaim\\|re\\(?:start-\\(?:bind\\|case\\)\\|turn\\(?:-from\\)?\\)\\|symbol-macrolet\\|t\\(?:agbody\\|\\(?:h\\|ypecas\\)e\\)\\|unless\\|when\\)\\>" (1 font-lock-keyword-face)) ("(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\>[ ']*\\(\\sw+\\)?" (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) ("(\\(abort\\|assert\\|error\\|signal\\)\\>" (1 font-lock-warning-face)) ("\\\\\\\\\\[\\(\\sw+\\)]" (1 font-lock-constant-face prepend)) ("`\\(\\sw\\sw+\\)'" (1 font-lock-constant-face prepend)) ("\\<:\\sw+\\>" (0 font-lock-builtin-face)) ("\\&\\sw+\\>" (0 font-lock-type-face)) ("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" (1 font-lock-keyword-face)) ("^\\s(" (0 (if (memq (get-text-property (1- (point)) (quote face)) (quote (font-lock-string-face font-lock-doc-face font-lock-comment-face))) font-lock-warning-face) prepend)))) (quote ((font-lock-warning-face 55201 55206 47559 47564 47456 47461 47335 47340 43794 43799 43550 43555 39905 39910 37088 37093 37049 37054 36975 36980 36388 36393 36319 36324 35630 35635 33726 33731 31500 31505 28699 28704 27614 27619 17351 17356 17294 17299 17230 17235 8965 8970 8883 8888 8431 8436 8348 8353) (font-lock-function-name-face 56566 56582 56363 56377 56151 56163 56059 56080 55967 55986 55867 55882 55676 55693 55467 55487 55257 55277 54212 54232 54047 54069 47713 47732 46748 46761 46576 46593 46406 46423 46202 46219 46027 46046 45883 45899 45702 45718 45579 45603 45390 45410 45273 45291 40025 40040 37149 37166 35691 35714 33909 33926 33787 33798 31562 31583 29322 29345 29088 29099 28972 28981 28782 28795 27678 27688 26961 26972 26334 26351 25767 25787 18135 18154 17070 17083 16751 16766 16451 16464 16148 16159 15903 15926 15698 15713 15494 15508 14813 14836 14376 14397 12827 12838 12495 12513 12162 12173 12083 12100 11966 11992 11858 11876 11760 11778 10574 10586 8188 8193 7685 7694 7230 7242 7142 7161 5666 5672 5070 5075 1177 1188 1071 1081) (font-lock-doc-face 14423 14534 751 792 657 717 554 595 365 517) (font-lock-variable-name-face 39998 40011 39973 39983 10544 10560 10511 10530 10479 10497 8155 8174 8119 8139 8080 8103 7645 7673 7583 7600 7523 7539 7462 7474 804 819 729 744 636 650 607 620 529 547 340 358) (font-lock-string-face 56808 56814 56651 56687 56523 56549 56481 56509 56317 56341 56272 56298 56098 56114 56004 56022 55784 55788 55711 55715 55578 55585 55505 55509 55368 55376 55295 55299 55207 55236 55138 55143 55072 55081 54993 54998 54919 54934 54851 54862 54733 54742 54708 54715 54653 54662 54621 54636 54566 54576 54511 54519 54457 54466 54402 54411 54347 54356 54289 54303 54095 54111 53914 53921 53758 53825 53692 53732 53481 53527 53447 53454 53408 53410 53279 53346 53213 53253 53002 53048 52968 52975 52760 52845 52694 52734 52644 52668 52396 52442 52362 52369 52154 52239 52088 52128 52038 52062 51790 51836 51756 51763 51604 51696 51384 51468 51350 51358 51117 51162 50908 50951 50662 50705 50416 50459 50197 50279 50132 50167 50073 50099 49972 50012 49938 49946 49185 49192 49144 49151 49104 49110 49062 49070 48928 48975 48818 48880 48526 48534 48488 48496 48348 48414 47937 47945 47863 47895 47832 47840 47565 47592 47513 47520 47462 47486 47397 47404 47341 47370 47217 47224 46979 46994 46811 46826 46710 46716 46657 46659 46652 46656 46540 46544 46487 46489 46482 46486 46336 46343 46283 46285 46278 46282 46133 46150 46011 46013 45973 46000 45799 45817 45686 45688 45664 45681 45486 45495 45367 45376 45350 45362 45109 45140 45087 45093 45070 45076 44772 44859 44535 44588 44507 44515 44350 44413 44223 44262 44195 44203 44151 44158 44117 44126 44065 44091 43975 44024 43879 43927 43800 43825 43696 43711 43556 43588 43345 43405 43210 43219 43166 43186 43059 43097 43028 43033 42979 42984 42851 42926 42713 42795 42622 42628 42554 42561 42477 42532 42445 42449 42403 42407 42289 42371 42179 42223 42152 42157 41903 42003 41873 41881 41566 41668 41320 41417 41127 41206 41019 41059 40929 40972 40813 40861 40738 40766 40645 40653 40506 40512 39911 39940 39893 39895 39859 39884 39802 39808 39478 39627 39462 39464 39428 39453 39281 39320 39218 39220 39184 39209 39112 39150 38984 39039 38968 38970 38934 38959 38743 38745 38709 38734 38637 38675 38518 38575 38502 38504 38468 38493 38330 38332 38296 38321 38224 38262 38128 38193 38112 38114 38078 38103 37946 37989 37858 37889 37746 37800 37656 37687 37568 37599 37479 37510 37390 37421 37338 37340 37291 37317 37223 37258 37094 37123 37055 37077 36981 37004 36819 36880 36630 36634 36627 36629 36520 36566 36394 36417 36325 36348 36221 36268 36135 36167 36050 36080 35966 35997 35881 35912 35796 35827 35636 35665 35596 35602 35371 35449 35318 35320 35124 35168 34935 34939 34932 34934 34805 34871 34631 34685 34551 34572 34463 34493 34415 34417 34322 34324 34233 34235 34142 34144 34051 34053 33889 33895 33880 33883 33732 33761 33692 33698 33394 33529 33248 33313 33140 33144 33007 33061 32804 32807 32799 32803 32660 32714 32455 32544 32331 32394 32220 32276 32110 32164 31997 32053 31886 31941 31775 31831 31665 31719 31506 31535 31470 31476 31447 31453 31438 31441 31028 31253 30878 30947 30718 30779 30455 30524 30244 30339 30114 30183 29998 30059 29883 29942 29766 29826 29650 29711 29533 29594 29418 29477 29254 29258 29201 29203 29196 29200 28881 28883 28876 28880 28705 28734 28684 28687 28674 28683 28566 28573 28510 28525 28460 28470 28410 28418 28361 28370 28311 28320 28261 28270 28208 28222 28163 28165 28153 28162 28114 28126 27997 28004 27831 27833 27822 27830 27791 27808 27620 27649 27603 27606 27506 27521 27442 27452 27337 27344 27287 27302 27243 27253 27199 27207 27156 27165 27112 27121 27068 27077 27021 27035 26846 26848 26842 26845 26796 26804 26724 26735 26615 26625 26152 26169 26044 26060 25738 25745 25695 25714 25663 25672 25622 25640 25531 25598 25430 25494 25325 25395 25296 25301 25178 25248 25118 25125 25076 25095 25044 25053 25003 25021 24956 24980 24848 24919 24795 24824 24694 24761 24648 24671 24592 24614 24563 24568 24437 24516 24405 24412 24355 24381 24282 24300 24219 24223 24197 24209 24084 24089 23951 24037 23888 23916 23832 23839 23795 23802 23729 23764 23608 23682 23546 23553 23504 23523 23472 23481 23431 23449 23336 23407 23304 23306 23217 23271 23184 23186 23048 23138 23019 23024 22912 22959 22849 22856 22812 22819 22737 22781 22709 22714 22589 22662 22519 22526 22469 22495 22396 22414 22331 22335 22317 22321 22206 22211 22090 22146 22029 22055 21947 21954 21882 21886 21863 21872 21719 21750 21660 21695 21540 21613 21483 21505 21426 21433 21389 21396 21317 21356 21211 21270 21154 21161 21113 21131 21069 21090 21004 21008 20990 20994 20925 20946 20788 20825 20688 20726 20631 20653 20345 20506 20230 20238 20198 20202 20084 20151 19972 20022 19852 19925 19726 19792 19594 19679 19468 19534 19341 19421 19213 19294 19086 19166 18954 19038 18923 18931 18857 18866 18716 18725 18594 18616 18533 18559 18441 18479 18296 18304 17961 18056 17883 17891 17852 17858 17829 17839 17689 17741 17560 17584 17516 17540 17495 17503 17357 17387 17300 17331 17236 17273 16909 16913 16804 16818 16607 16611 16502 16516 16301 16305 16196 16210 16085 16089 15947 15949 15840 15844 15734 15736 15635 15639 15529 15531 15331 15361 14568 14582 14343 14353 14319 14334 14298 14308 14282 14287 14249 14271 14201 14213 14172 14190 14139 14161 14121 14128 14101 14112 14085 14090 14065 14076 14044 14052 14013 14026 13937 13963 13921 13924 13913 13920 12892 13836 12216 12222 12149 12151 12131 12135 12023 12031 11907 11914 11809 11815 11411 11440 11384 11392 10105 10113 10076 10094 10045 10065 9962 10004 9879 9897 9838 9868 9790 9827 9744 9779 9708 9733 9679 9691 9632 9668 9616 9620 9536 9561 9515 9523 9483 9496 9420 9444 9401 9409 9370 9383 9350 9358 9290 9326 9200 9231 9163 9188 9135 9146 9088 9124 9051 9059 8971 8994 8889 8917 8782 8794 8437 8464 8354 8374 7607 7632 7546 7571 7481 7510 7209 7216 7197 7208 6673 6684 6598 6610 6371 6383 6136 6148 4141 4152 3873 3884 3771 3782 3712 3723 3348 3361 3244 3257 1452 1463 1405 1414 1359 1367 1314 1321 1209 1278 820 823 104 107 93 97) (font-lock-constant-face 132 137 48 50 34 36) (font-lock-keyword-face 56602 56604 56560 56565 56413 56419 56388 56390 56357 56362 56204 56210 56179 56181 56145 56150 56053 56058 55961 55966 55861 55866 55755 55761 55670 55675 55549 55555 55461 55466 55339 55345 55251 55256 54770 54776 54243 54247 54206 54211 54041 54046 49842 49845 49821 49827 49492 49496 49404 49408 49375 49381 49331 49337 48748 48762 48728 48734 48133 48147 48042 48048 47997 48000 47982 47988 47739 47742 47707 47712 47537 47539 47445 47447 47421 47425 47324 47326 47295 47299 47167 47169 47148 47153 47006 47010 46954 46959 46835 46849 46781 46784 46742 46747 46691 46697 46626 46628 46570 46575 46521 46527 46456 46458 46400 46405 46317 46323 46252 46254 46196 46201 46111 46113 46058 46061 46021 46026 45916 45918 45877 45882 45780 45786 45696 45701 45615 45617 45573 45578 45467 45473 45384 45389 45303 45305 45267 45272 45048 45050 44701 44715 43935 43937 43837 43839 43751 43753 43635 43638 43598 43602 43505 43507 43300 43303 43285 43290 43229 43232 42994 43000 42636 42650 42596 42602 40660 40674 40518 40522 40450 40452 40358 40364 40289 40295 40101 40105 40080 40085 40047 40050 40019 40024 39989 39997 39964 39972 39839 39841 39408 39410 39164 39166 38914 38916 38843 38849 38689 38691 38448 38450 38378 38384 38276 38278 38058 38060 37346 37350 37271 37273 37143 37148 36753 36759 36615 36617 36455 36461 35753 35757 35685 35690 35058 35064 34920 34922 34740 34746 33965 33969 33903 33908 33781 33786 32942 32948 32787 32789 32596 32602 31622 31626 31556 31561 30653 30659 30391 30397 29375 29379 29316 29321 29235 29241 29149 29151 29082 29087 29022 29028 28966 28971 28915 28921 28829 28831 28776 28781 28662 28664 28141 28143 28047 28053 28011 28015 27810 27812 27709 27711 27672 27677 27378 27384 26984 26988 26955 26960 26806 26808 26661 26665 26488 26492 26459 26462 26439 26444 26379 26382 26328 26333 26089 26093 25917 25921 25888 25891 25868 25873 25808 25811 25761 25766 24308 24310 24145 24151 22422 22424 22267 22273 21817 21823 20891 20897 20269 20283 18830 18836 18689 18695 18362 18376 18166 18169 18129 18134 17897 17911 17663 17669 17199 17203 17161 17164 17147 17153 17091 17094 17064 17069 16827 16841 16774 16777 16745 16750 16525 16539 16472 16475 16445 16450 16219 16233 16166 16169 16142 16147 16053 16055 15964 15969 15939 15942 15897 15902 15808 15810 15744 15749 15726 15729 15692 15697 15603 15605 15539 15544 15521 15524 15488 15493 15251 15253 15169 15172 15101 15106 15080 15094 14962 14965 14875 14877 14855 14869 14807 14812 14705 14710 14591 14605 14538 14541 14370 14375 13968 13970 13862 13865 13842 13844 12821 12826 12668 12672 12524 12527 12489 12494 12315 12318 12278 12280 12196 12200 12156 12161 12077 12082 11960 11965 11852 11857 11754 11759 11325 11329 10928 10933 10722 10725 10568 10573 10537 10543 10504 10510 10472 10478 10408 10414 10330 10336 10220 10222 10175 10177 10119 10121 9449 9451 9023 9028 9001 9015 8924 8926 8823 8825 8675 8679 8392 8394 8318 8320 8182 8187 8146 8154 8110 8118 8071 8079 7679 7684 7636 7644 7574 7582 7514 7522 7453 7461 7409 7414 7319 7322 7224 7229 7136 7141 6782 6784 6742 6747 6716 6719 6572 6575 6070 6076 5966 5972 5679 5682 5657 5665 5061 5069 3655 3659 3637 3642 3518 3520 3120 3122 2976 2982 2904 2906 2763 2769 2692 2694 2149 2155 1631 1633 1616 1621 1574 1577 1492 1494 1282 1285 1168 1176 1062 1070 1044 1060 795 803 720 728 627 635 598 606 520 528 331 339 239 255 140 156 123 130 54 70 39 46 25 32) (font-lock-comment-face 55892 55933 51312 51322 49900 49910 49740 49795 49245 49296 48681 48693 48196 48324 47903 47912 47691 47705 42568 42591 35262 35316 34363 34413 34272 34320 34182 34231 34091 34140 34000 34049 33814 33870 27872 27985 25133 25157 23847 23867 23561 23587 22864 22891 22534 22568 21990 22008 21962 21985 21441 21462 21169 21190 20596 20610 20245 20263 18311 18356 17048 17062 12613 12663 10262 10309 7272 7316 7118 7134 7041 7072 7010 7037 5159 5268 4560 5060 4493 4524 4462 4489 4399 4458 4069 4086 3801 3818 3486 3513 2519 2533 2293 2312 1984 2005 1900 1915 1802 1834 826 1043 320 329 198 238 1 23))))
diff --git a/xdelta1/libedsio/edsio.h b/xdelta1/libedsio/edsio.h
index 22013f7..da77188 100755
--- a/xdelta1/libedsio/edsio.h
+++ b/xdelta1/libedsio/edsio.h
@@ -105,7 +105,7 @@ struct _SerialSink {
105 105
106 /* These are setup by init. 106 /* These are setup by init.
107 */ 107 */
108 gboolean (* sink_type) (SerialSink* sink, SerialType type, guint mem_size, gboolean set_allocation); 108 gboolean (* sink_type) (SerialSink* sink, SerialType type, guint32 mem_size, gboolean set_allocation);
109 gboolean (* sink_close) (SerialSink* sink); 109 gboolean (* sink_close) (SerialSink* sink);
110 gboolean (* sink_write) (SerialSink* sink, const guint8 *ptr, guint32 len); 110 gboolean (* sink_write) (SerialSink* sink, const guint8 *ptr, guint32 len);
111 void (* sink_free) (SerialSink* sink); 111 void (* sink_free) (SerialSink* sink);
@@ -165,7 +165,7 @@ gboolean serializeio_unserialize_generic_acceptable (SerialSource* source
165void serializeio_sink_init (SerialSink* sink, 165void serializeio_sink_init (SerialSink* sink,
166 gboolean (* sink_type) (SerialSink* sink, 166 gboolean (* sink_type) (SerialSink* sink,
167 SerialType type, 167 SerialType type,
168 guint mem_size, 168 guint32 mem_size,
169 gboolean set_allocation), 169 gboolean set_allocation),
170 gboolean (* sink_close) (SerialSink* sink), 170 gboolean (* sink_close) (SerialSink* sink),
171 gboolean (* sink_write) (SerialSink* sink, 171 gboolean (* sink_write) (SerialSink* sink,
diff --git a/xdelta1/libedsio/edsio.prj b/xdelta1/libedsio/edsio.prj
deleted file mode 100755
index 6f4f064..0000000
--- a/xdelta1/libedsio/edsio.prj
+++ /dev/null
@@ -1,40 +0,0 @@
1;; -*- Prcs -*-
2(Created-By-Prcs-Version 1 2 16)
3(Project-Description "")
4(Project-Version edsio xdelta11-maint 1)
5(Parent-Version edsio 0 47)
6(Version-Log "")
7(New-Version-Log "")
8(Checkin-Time "Mon, 11 Jun 2001 01:56:01 -0700")
9(Checkin-Login jmacd)
10(Populate-Ignore (".libs" ".deps" "\\.lo$" "\\.o$" "\\.la$" "edsiotest$" "\\.elc$" "CVS" "edsio_edsio\\." "edsio-comp$" "dead.code" "stamp-ser" "Makefile.in" "Makefile"))
11(Project-Keywords)
12(Files
13 (Makefile.am (edsio/0_Makefile.a 1.9 644))
14 (edsio.el (edsio/1_edsio.el 1.16 644))
15 (edsio-comp.in (edsio/2_edsio-comp 1.2 644))
16 (edsio.ser (edsio/3_edsio.ser 1.9 644))
17 (edsio.h (edsio/7_serializei 1.15.1.1 644))
18 (edsio.c (edsio/8_serializei 1.24.1.1 644))
19 (sha.c (edsio/9_sha.c 1.2 644))
20 (md5c.c (edsio/10_md5c.c 1.1 644))
21 (edsiotest.c (edsio/11_edsiotest. 1.6 644))
22 (base64.c (edsio/12_base64.c 1.14 644))
23 (simple.c (edsio/13_simple.c 1.6 644))
24 (default.c (edsio/14_default.c 1.5 644))
25 (generic.c (edsio/15_generic.c 1.3 644))
26 (fh.c (edsio/16_fh.c 1.3 644))
27 (library.c (edsio/21_library.c 1.1 644))
28
29 ;; Sources obtained from RCS, primarily for parsing date formats.
30 (partime.c (edsio/17_partime.c 1.1 644))
31 (maketime.c (edsio/18_maketime.c 1.1 644))
32 (maketime.h (edsio/19_maketime.h 1.1 644))
33 (partime.h (edsio/20_partime.h 1.1 644))
34
35 ;; Not used
36 (modtest.c (edsio/22_modtest.c 1.1 644))
37 (modtest.ser (edsio/23_modtest.se 1.1 644))
38)
39(Merge-Parents)
40(New-Merge-Parents)
diff --git a/xdelta1/libedsio/edsio_edsio.c b/xdelta1/libedsio/edsio_edsio.c
index d841dda..01113df 100755
--- a/xdelta1/libedsio/edsio_edsio.c
+++ b/xdelta1/libedsio/edsio_edsio.c
@@ -231,22 +231,6 @@ proptest_isset_uint (PropTest* obj, EdsioPropTestUintProperty prop)
231 return edsio_property_isset ("PropTest", "uint", prop.code, obj); 231 return edsio_property_isset ("PropTest", "uint", prop.code, obj);
232} 232}
233 233
234/* EdsioUint Count
235 */
236
237guint
238serializeio_count_edsiouint (guint32 val) {
239 guint size = sizeof (SerialEdsioUint);
240 ALIGN_8 (size);
241 ALIGN_8 (size);
242 return size;
243}
244
245guint
246serializeio_count_edsiouint_obj (SerialEdsioUint const* obj) {
247 return serializeio_count_edsiouint (obj->val);
248}
249
250/* EdsioUint Print 234/* EdsioUint Print
251 */ 235 */
252 236
@@ -331,23 +315,6 @@ bail:
331 return FALSE; 315 return FALSE;
332} 316}
333 317
334/* EdsioBytes Count
335 */
336
337guint
338serializeio_count_edsiobytes (guint32 val_len, const guint8* val) {
339 guint size = sizeof (SerialEdsioBytes);
340 ALIGN_8 (size);
341 size += val_len;
342 ALIGN_8 (size);
343 return size;
344}
345
346guint
347serializeio_count_edsiobytes_obj (SerialEdsioBytes const* obj) {
348 return serializeio_count_edsiobytes (obj->val_len, obj->val);
349}
350
351/* EdsioBytes Print 318/* EdsioBytes Print
352 */ 319 */
353 320
@@ -432,23 +399,6 @@ bail:
432 return FALSE; 399 return FALSE;
433} 400}
434 401
435/* EdsioString Count
436 */
437
438guint
439serializeio_count_edsiostring (const gchar* val) {
440 guint size = sizeof (SerialEdsioString);
441 ALIGN_8 (size);
442 size += strlen (val) + 1;
443 ALIGN_8 (size);
444 return size;
445}
446
447guint
448serializeio_count_edsiostring_obj (SerialEdsioString const* obj) {
449 return serializeio_count_edsiostring (obj->val);
450}
451
452/* EdsioString Print 402/* EdsioString Print
453 */ 403 */
454 404
@@ -533,23 +483,6 @@ bail:
533 return FALSE; 483 return FALSE;
534} 484}
535 485
536/* GenericTime Count
537 */
538
539guint
540serializeio_count_generictime (guint32 seconds, guint32 nanos) {
541 guint size = sizeof (SerialGenericTime);
542 ALIGN_8 (size);
543 ALIGN_8 (size);
544 ALIGN_8 (size);
545 return size;
546}
547
548guint
549serializeio_count_generictime_obj (SerialGenericTime const* obj) {
550 return serializeio_count_generictime (obj->seconds, obj->nanos);
551}
552
553/* GenericTime Print 486/* GenericTime Print
554 */ 487 */
555 488