Skip to content

[core] deprecate implementation detail zip headers since there is RZip public interface #23271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpiparo merged 4 commits into from
Sep 11, 2026
Merged

[core] deprecate implementation detail zip headers since there is RZip public interface #23271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecd87f2
[core] deprecate implementation detail zip headers since there is RZi…
ferdymercury Sep 5, 2026
d703226
[RN] mention deprecation
ferdymercury Sep 5, 2026
84c56e5
[zip] do not use deprecated header
ferdymercury Sep 6, 2026
85f5d5e
[nfc] mention temporary duplications
ferdymercury Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README/ReleaseNotes/v642/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ The `TMVA_SOFIE_GNN` tutorials have been migrated to this workflow and produce i
* The header `snprintf.h` is deprecated (will emit warnings) and will be removed in ROOT 6.44. Use instead `<cstdio>`.
* The header `Strlen.h` is deprecated and will be removed in ROOT 6.44. Use `<cstring>` directly as a replacement. `NEED_STRING` macro should not be defined or an error will be raised.
* The header `Rstrstream.h` is deprecated and will be removed after ROOT 6.44, use instead `<sstream>`.
* The headers `ZipLZMA.h`, `ZipLZ4.h` and `ZipZSTD.h` are deprecated and will be removed in ROOT 6.46, use instead the public methods in the `RZip.h` interface.

## Build System

Expand Down
61 changes: 59 additions & 2 deletions builtins/zip/ZInflate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,65 @@ static const int qflag = 0;

#include "zlib.h"
#include "RConfigure.h"
#include "ZipLZMA.h"
#include "ZipLZ4.h"

Comment thread
ferdymercury marked this conversation as resolved.
// TEMPORARY DUPLICATION OF ZipLZMA.h until header is removed from public interface and can be made fully private
// @(#)root/lzma:$Id$
// Author: David Dagenhart May 2011

/*************************************************************************
* Copyright (C) 1995-2011, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipLZMA
#define ROOT_ZipLZMA

#ifdef __cplusplus
extern "C" {
#endif

void R__zipLZMA(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);

void R__unzipLZMA(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);

#ifdef __cplusplus
}
#endif

#endif

Comment thread
ferdymercury marked this conversation as resolved.
// TEMPORARY DUPLICATION OF ZipLZ4.h until header is removed from public interface and can be made fully private
// Author: Brian Bockelman March 2015

/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipLZ4
#define ROOT_ZipLZ4

// NOTE: the ROOT compression libraries aren't consistently written in C++; hence the
// #ifdef's to avoid problems with C code.
#ifdef __cplusplus
extern "C" {
#endif
void R__zipLZ4(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);
void R__unzipLZ4(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);
#ifdef __cplusplus
}
#endif

#endif




/* inflate.c -- put in the public domain by Mark Adler
version c14o, 23 August 1994 */
Expand Down
2 changes: 2 additions & 0 deletions core/lz4/inc/ZipLZ4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#ifndef ROOT_ZipLZ4
#define ROOT_ZipLZ4

#warning "This header is deprecated and will be removed in 6.46, use instead methods within RZip.h"

// NOTE: the ROOT compression libraries aren't consistently written in C++; hence the
// #ifdef's to avoid problems with C code.
#ifdef __cplusplus
Expand Down
28 changes: 27 additions & 1 deletion core/lz4/src/ZipLZ4.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,33 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#include "ZipLZ4.h"
// TEMPORARY DUPLICATION OF ZipLZ4.h until header is removed from public interface and can be made fully private
// Author: Brian Bockelman March 2015
Comment thread
ferdymercury marked this conversation as resolved.

/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipLZ4
#define ROOT_ZipLZ4

// NOTE: the ROOT compression libraries aren't consistently written in C++; hence the
// #ifdef's to avoid problems with C code.
#ifdef __cplusplus
extern "C" {
#endif
void R__zipLZ4(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);
void R__unzipLZ4(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);
#ifdef __cplusplus
}
#endif

#endif


#include "ROOT/RConfig.hxx"

Expand Down
2 changes: 2 additions & 0 deletions core/lzma/inc/ZipLZMA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#ifndef ROOT_ZipLZMA
#define ROOT_ZipLZMA

#warning "This header is deprecated and will be removed in 6.46, use instead methods within RZip.h"

#ifdef __cplusplus
extern "C" {
#endif
Expand Down
30 changes: 29 additions & 1 deletion core/lzma/src/ZipLZMA.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,35 @@
#ifdef _MSC_VER
#define LZMA_API_STATIC
#endif
#include "ZipLZMA.h"
// TEMPORARY DUPLICATION OF ZipLZMA.h until header is removed from public interface and can be made fully private
// @(#)root/lzma:$Id$
Comment thread
ferdymercury marked this conversation as resolved.
// Author: David Dagenhart May 2011

/*************************************************************************
* Copyright (C) 1995-2011, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipLZMA
#define ROOT_ZipLZMA

#ifdef __cplusplus
extern "C" {
#endif

void R__zipLZMA(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);

void R__unzipLZMA(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);

#ifdef __cplusplus
}
#endif

#endif

#include "lzma.h"
#include <stdio.h>

Expand Down
86 changes: 83 additions & 3 deletions core/zip/src/RZip.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,89 @@
#include "RConfigure.h"
#include "RZip.h"
#include "Bits.h"
#include "ZipLZMA.h"
#include "ZipLZ4.h"
#include "ZipZSTD.h"

// TEMPORARY DUPLICATION OF ZipLZ4.h until header is removed from public interface and can be made fully private
// Author: Brian Bockelman March 2015
Comment thread
ferdymercury marked this conversation as resolved.
Comment thread
ferdymercury marked this conversation as resolved.

/*************************************************************************
* Copyright (C) 1995-2017, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipLZ4
#define ROOT_ZipLZ4

// NOTE: the ROOT compression libraries aren't consistently written in C++; hence the
// #ifdef's to avoid problems with C code.
#ifdef __cplusplus
extern "C" {
#endif
void R__zipLZ4(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);
void R__unzipLZ4(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);
#ifdef __cplusplus
}
#endif

#endif

// TEMPORARY DUPLICATION OF ZipLZMA.h until header is removed from public interface and can be made fully private
// @(#)root/lzma:$Id$
// Author: David Dagenhart May 2011

/*************************************************************************
* Copyright (C) 1995-2011, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipLZMA
#define ROOT_ZipLZMA

#ifdef __cplusplus
extern "C" {
#endif

void R__zipLZMA(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);

void R__unzipLZMA(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);

#ifdef __cplusplus
}
#endif

#endif

// TEMPORARY DUPLICATION OF ZipZSTD.h until header is removed from public interface and can be made fully private
// Original Author: Brian Bockelman
Comment thread
ferdymercury marked this conversation as resolved.
/*************************************************************************
* Copyright (C) 1995-2019, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipZSTD
#define ROOT_ZipZSTD

// NOTE: the ROOT compression libraries aren't consistently written in C++; hence the
// #ifdef's to avoid problems with C code.
#ifdef __cplusplus
extern "C" {
#endif
void R__zipZSTD(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);
void R__unzipZSTD(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);
#ifdef __cplusplus
}
#endif

#endif


#include "zlib.h"

Expand Down
2 changes: 2 additions & 0 deletions core/zstd/inc/ZipZSTD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#ifndef ROOT_ZipZSTD
#define ROOT_ZipZSTD

#warning "This header is deprecated and will be removed in 6.46, use instead methods within RZip.h"

// NOTE: the ROOT compression libraries aren't consistently written in C++; hence the
// #ifdef's to avoid problems with C code.
#ifdef __cplusplus
Expand Down
27 changes: 26 additions & 1 deletion core/zstd/src/ZipZSTD.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,32 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#include "ZipZSTD.h"
// TEMPORARY DUPLICATION OF ZipZSTD.h until header is removed from public interface and can be made fully private
// Original Author: Brian Bockelman
Comment thread
ferdymercury marked this conversation as resolved.
/*************************************************************************
* Copyright (C) 1995-2019, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_ZipZSTD
#define ROOT_ZipZSTD

// NOTE: the ROOT compression libraries aren't consistently written in C++; hence the
// #ifdef's to avoid problems with C code.
#ifdef __cplusplus
extern "C" {
#endif
void R__zipZSTD(int cxlevel, int *srcsize, const char *src, int *tgtsize, char *tgt, int *irep);
void R__unzipZSTD(int *srcsize, const unsigned char *src, int *tgtsize, unsigned char *tgt, int *irep);
#ifdef __cplusplus
}
#endif

#endif


#include "ROOT/RConfig.hxx"

Expand Down
Loading