The project "Citadel server, clients, utilities":
The branch, master has been updated
via cb6a7ff44a615fc3b114363ca993278077abe532 (commit)
from 5c46ebec391f344e8a16b66e5f987bc5ec350fa2 (commit)
- Log -----------------------------------------------------------------
commit cb6a7ff44a615fc3b114363ca993278077abe532
Author: Art Cancro <[email protected]>
Date: Thu May 29 19:06:35 2025 -0400
Switched to the original libxdiff-0.23 because libgit2/libxdiff doesn't have a
patch function.
-----------------------------------------------------------------------
Summary of changes:
citadel/server/modules/wiki/serv_wiki.c | 105 +--
citadel/server/modules/xdiff/COPYING | 18 -
citadel/server/modules/xdiff/README.md | 25 -
citadel/server/modules/xdiff/README.txt | 6 +
citadel/server/modules/xdiff/git-2.48.1.patch | 240 -------
citadel/server/modules/xdiff/git-xdiff.h | 79 ---
citadel/server/modules/xdiff/xadler32.c | 70 ++
.../modules/xdiff/{xprepare.h => xadler32.h} | 16 +-
.../server/modules/xdiff/{xprepare.h => xalloc.c} | 35 +-
citadel/server/modules/xdiff/xbdiff.c | 315 +++++++++
.../server/modules/xdiff/{xprepare.h => xbdiff.h} | 22 +-
citadel/server/modules/xdiff/xbpatchi.c | 336 +++++++++
citadel/server/modules/xdiff/xdiff.h | 135 ++--
citadel/server/modules/xdiff/xdiffi.c | 786 ++++-----------------
citadel/server/modules/xdiff/xdiffi.h | 10 +-
citadel/server/modules/xdiff/xemit.c | 232 +-----
citadel/server/modules/xdiff/xemit.h | 8 +-
citadel/server/modules/xdiff/xhistogram.c | 370 ----------
citadel/server/modules/xdiff/xinclude.h | 16 +-
citadel/server/modules/xdiff/xmacros.h | 40 +-
citadel/server/modules/xdiff/xmerge.c | 739 -------------------
citadel/server/modules/xdiff/xmerge3.c | 66 ++
citadel/server/modules/xdiff/xpatchi.c | 641 +++++++++++++++++
citadel/server/modules/xdiff/xpatience.c | 373 ----------
citadel/server/modules/xdiff/xprepare.c | 321 +++++----
citadel/server/modules/xdiff/xprepare.h | 5 +-
citadel/server/modules/xdiff/xrabdiff.c | 381 ++++++++++
citadel/server/modules/xdiff/xrabply.c | 298 ++++++++
citadel/server/modules/xdiff/xtypes.h | 5 +-
citadel/server/modules/xdiff/xutils.c | 635 ++++++++++-------
citadel/server/modules/xdiff/xutils.h | 23 +-
citadel/server/user_ops.c | 2 +-
citadel/tests/xdifftester/Makefile | 2 +-
citadel/tests/xdifftester/xdifftest.c | 127 ++--
34 files changed, 3077 insertions(+), 3405 deletions(-)
delete mode 100644 citadel/server/modules/xdiff/COPYING
delete mode 100644 citadel/server/modules/xdiff/README.md
create mode 100644 citadel/server/modules/xdiff/README.txt
delete mode 100644 citadel/server/modules/xdiff/git-2.48.1.patch
delete mode 100644 citadel/server/modules/xdiff/git-xdiff.h
create mode 100644 citadel/server/modules/xdiff/xadler32.c
copy citadel/server/modules/xdiff/{xprepare.h => xadler32.h} (69%)
copy citadel/server/modules/xdiff/{xprepare.h => xalloc.c} (52%)
create mode 100644 citadel/server/modules/xdiff/xbdiff.c
copy citadel/server/modules/xdiff/{xprepare.h => xbdiff.h} (62%)
create mode 100644 citadel/server/modules/xdiff/xbpatchi.c
delete mode 100644 citadel/server/modules/xdiff/xhistogram.c
delete mode 100644 citadel/server/modules/xdiff/xmerge.c
create mode 100644 citadel/server/modules/xdiff/xmerge3.c
create mode 100644 citadel/server/modules/xdiff/xpatchi.c
delete mode 100644 citadel/server/modules/xdiff/xpatience.c
create mode 100644 citadel/server/modules/xdiff/xrabdiff.c
create mode 100644 citadel/server/modules/xdiff/xrabply.c
--
Citadel server, clients, utilities
