Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 11:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

include: linux: Remove duplicate newlines

Browse source 
Drop all duplicate newlines. No functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2024-07-23 01:28:26 +02:00 • committed by Tom Rini
parent b668901648
commit 9fb4be152b
22 changed files with 0 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/linux/asn1.h
View file

@ -17,7 +17,6 @@ enum asn1_class {
}; };
#define ASN1_CLASS_BITS 0xc0 #define ASN1_CLASS_BITS 0xc0
enum asn1_method { enum asn1_method {
ASN1_PRIM = 0, /* Primitive */ ASN1_PRIM = 0, /* Primitive */
ASN1_CONS = 1 /* Constructed */ ASN1_CONS = 1 /* Constructed */

1
include/linux/bitops.h
View file

@ -108,7 +108,6 @@ static inline int generic_fls(int x)
return r; return r;
} }
/* /*
* hweightN: returns the hamming weight (i.e. the number * hweightN: returns the hamming weight (i.e. the number
* of bits set) of a N-bit word * of bits set) of a N-bit word

2
include/linux/byteorder/swab.h
View file

@ -76,7 +76,6 @@
# define __arch__swab64s(x) do { *(x) = __swab64p((x)); } while (0) # define __arch__swab64s(x) do { *(x) = __swab64p((x)); } while (0)
#endif #endif
/* /*
* Allow constant folding * Allow constant folding
*/ */
@ -99,7 +98,6 @@
# define __swab64(x) __fswab64(x) # define __swab64(x) __fswab64(x)
#endif /* OPTIMIZE */ #endif /* OPTIMIZE */
static __inline__ __attribute__((const)) __u16 __fswab16(__u16 x) static __inline__ __attribute__((const)) __u16 __fswab16(__u16 x)
{ {
return __arch__swab16(x); return __arch__swab16(x);

1
include/linux/edd.h
View file

@ -35,7 +35,6 @@
#define EDDMAGIC1 0x55AA #define EDDMAGIC1 0x55AA
#define EDDMAGIC2 0xAA55 #define EDDMAGIC2 0xAA55
#define READ_SECTORS 0x02 /* int13 AH=0x02 is READ_SECTORS command */ #define READ_SECTORS 0x02 /* int13 AH=0x02 is READ_SECTORS command */
#define EDD_MBR_SIG_OFFSET 0x1B8 /* offset of signature in the MBR */ #define EDD_MBR_SIG_OFFSET 0x1B8 /* offset of signature in the MBR */
#define EDD_MBR_SIG_BUF 0x290 /* addr in boot params */ #define EDD_MBR_SIG_BUF 0x290 /* addr in boot params */

1
include/linux/err.h
View file

@ -6,7 +6,6 @@
#include <linux/errno.h> #include <linux/errno.h>
/* /*
* Kernel pointers have redundant information, so we can use a * Kernel pointers have redundant information, so we can use a
* scheme where we can return either an error code or a dentry * scheme where we can return either an error code or a dentry

1
include/linux/ethtool.h
View file

@ -376,7 +376,6 @@ struct ethtool_usrip4_spec {
__u8 proto; __u8 proto;
}; };
/** /**
* struct ethtool_rxfh_indir - command to get or set RX flow hash indirection * struct ethtool_rxfh_indir - command to get or set RX flow hash indirection
* @cmd: Specific command number - %ETHTOOL_GRXFHINDIR or %ETHTOOL_SRXFHINDIR * @cmd: Specific command number - %ETHTOOL_GRXFHINDIR or %ETHTOOL_SRXFHINDIR

2
include/linux/fb.h
View file

@ -160,7 +160,6 @@ struct fb_con2fbmap {
#define VESA_HSYNC_SUSPEND 2 #define VESA_HSYNC_SUSPEND 2
#define VESA_POWERDOWN 3 #define VESA_POWERDOWN 3
enum { enum {
/* screen: unblanked, hsync: on, vsync: on */ /* screen: unblanked, hsync: on, vsync: on */
FB_BLANK_UNBLANK = VESA_NO_BLANKING, FB_BLANK_UNBLANK = VESA_NO_BLANKING,
@ -583,7 +582,6 @@ struct fb_info {
#define FB_MODE_IS_FIRST 16 #define FB_MODE_IS_FIRST 16
#define FB_MODE_IS_FROM_VAR 32 #define FB_MODE_IS_FROM_VAR 32
/* drivers/video/fbcmap.c */ /* drivers/video/fbcmap.c */
extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp); extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp);

1
include/linux/kernel.h
View file

@ -255,7 +255,6 @@
*/ */
#define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi) #define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi)
/* /*
* swap - swap value of @a and @b * swap - swap value of @a and @b
*/ */

2
include/linux/mtd/flashchip.h
View file

@ -51,7 +51,6 @@ typedef enum {
FL_UNKNOWN FL_UNKNOWN
} flstate_t; } flstate_t;
/* NOTE: confusingly, this can be used to refer to more than one chip at a time, /* NOTE: confusingly, this can be used to refer to more than one chip at a time,
if they're interleaved. This can even refer to individual partitions on if they're interleaved. This can even refer to individual partitions on
the same physical chip when present. */ the same physical chip when present. */
@ -98,5 +97,4 @@ struct flchip_shared {
struct flchip *erasing; struct flchip *erasing;
}; };
#endif /* __MTD_FLASHCHIP_H__ */ #endif /* __MTD_FLASHCHIP_H__ */

2
include/linux/mtd/mtd.h
View file

@ -522,7 +522,6 @@ extern void __put_mtd_device(struct mtd_info *mtd);
extern struct mtd_info *get_mtd_device_nm(const char *name); extern struct mtd_info *get_mtd_device_nm(const char *name);
extern void put_mtd_device(struct mtd_info *mtd); extern void put_mtd_device(struct mtd_info *mtd);
#ifndef __UBOOT__ #ifndef __UBOOT__
struct mtd_notifier { struct mtd_notifier {
void (*add)(struct mtd_info *mtd); void (*add)(struct mtd_info *mtd);
@ -530,7 +529,6 @@ struct mtd_notifier {
struct list_head list; struct list_head list;
}; };
extern void register_mtd_user (struct mtd_notifier *new); extern void register_mtd_user (struct mtd_notifier *new);
extern int unregister_mtd_user (struct mtd_notifier *old); extern int unregister_mtd_user (struct mtd_notifier *old);
#endif #endif

3
include/linux/mtd/partitions.h
View file

@ -11,7 +11,6 @@
#include <linux/types.h> #include <linux/types.h>
/* /*
* Partition definition structure: * Partition definition structure:
* *
@ -49,7 +48,6 @@ struct mtd_partition {
#define MTDPART_OFS_APPEND (-1) #define MTDPART_OFS_APPEND (-1)
#define MTDPART_SIZ_FULL (0) #define MTDPART_SIZ_FULL (0)
struct mtd_info; struct mtd_info;
struct device_node; struct device_node;
@ -64,7 +62,6 @@ struct mtd_part_parser_data {
struct device_node *of_node; struct device_node *of_node;
}; };
/* /*
* Functions dealing with the various ways of partitioning the space * Functions dealing with the various ways of partitioning the space
*/ */

2
include/linux/mtd/rawnand.h
View file

@ -177,7 +177,6 @@ enum nand_ecc_algo {
/* Bit mask for flags passed to do_nand_read_ecc */ /* Bit mask for flags passed to do_nand_read_ecc */
#define NAND_GET_DEVICE 0x80 #define NAND_GET_DEVICE 0x80
/* /*
* Option constants for bizarre disfunctionality and real * Option constants for bizarre disfunctionality and real
* features. * features.
@ -931,7 +930,6 @@ struct nand_chip {
int (*setup_data_interface)(struct mtd_info *mtd, int chipnr, int (*setup_data_interface)(struct mtd_info *mtd, int chipnr,
const struct nand_data_interface *conf); const struct nand_data_interface *conf);
int chip_delay; int chip_delay;
unsigned int options; unsigned int options;
unsigned int bbt_options; unsigned int bbt_options;

3
include/linux/rbtree.h
View file

@ -32,7 +32,6 @@ struct rb_root {
struct rb_node *rb_node; struct rb_node *rb_node;
}; };
#define rb_parent(r) ((struct rb_node *)((r)->__rb_parent_color & ~3)) #define rb_parent(r) ((struct rb_node *)((r)->__rb_parent_color & ~3))
#define RB_ROOT (struct rb_root) { NULL, } #define RB_ROOT (struct rb_root) { NULL, }
@ -46,11 +45,9 @@ struct rb_root {
#define RB_CLEAR_NODE(node) \ #define RB_CLEAR_NODE(node) \
((node)->__rb_parent_color = (unsigned long)(node)) ((node)->__rb_parent_color = (unsigned long)(node))
extern void rb_insert_color(struct rb_node *, struct rb_root *); extern void rb_insert_color(struct rb_node *, struct rb_root *);
extern void rb_erase(struct rb_node *, struct rb_root *); extern void rb_erase(struct rb_node *, struct rb_root *);
/* Find logical next and previous nodes in a tree */ /* Find logical next and previous nodes in a tree */
extern struct rb_node *rb_next(const struct rb_node *); extern struct rb_node *rb_next(const struct rb_node *);
extern struct rb_node *rb_prev(const struct rb_node *); extern struct rb_node *rb_prev(const struct rb_node *);

1
include/linux/rbtree_augmented.h
View file

@ -70,7 +70,6 @@ rbstatic const struct rb_augment_callbacks rbname = { \
rbname ## _propagate, rbname ## _copy, rbname ## _rotate \ rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
}; };
#define RB_RED 0 #define RB_RED 0
#define RB_BLACK 1 #define RB_BLACK 1

1
include/linux/serial_reg.h
View file

@ -287,7 +287,6 @@
#define UART_ACR_ICRRD 0x40 /* ICR Read enable */ #define UART_ACR_ICRRD 0x40 /* ICR Read enable */
#define UART_ACR_ASREN 0x80 /* Additional status enable */ #define UART_ACR_ASREN 0x80 /* Additional status enable */
/* /*
* These definitions are for the RSA-DV II/S card, from * These definitions are for the RSA-DV II/S card, from
* *

1
include/linux/string.h
View file

@ -14,7 +14,6 @@ extern char * strtok(char *,const char *);
extern char * strsep(char **,const char *); extern char * strsep(char **,const char *);
extern __kernel_size_t strspn(const char *,const char *); extern __kernel_size_t strspn(const char *,const char *);
/* /*
* Include machine specific inline routines * Include machine specific inline routines
*/ */

1
include/linux/time.h
View file

@ -34,7 +34,6 @@
#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
/* Used by other time functions. */ /* Used by other time functions. */
struct tm { struct tm {
int tm_sec; /* Seconds. [0-60] (1 leap second) */ int tm_sec; /* Seconds. [0-60] (1 leap second) */

5
include/linux/usb/ch9.h
View file

@ -248,7 +248,6 @@ struct usb_descriptor_header {
__u8 bDescriptorType; __u8 bDescriptorType;
} __attribute__ ((packed)); } __attribute__ ((packed));
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* USB_DT_DEVICE: Device descriptor */ /* USB_DT_DEVICE: Device descriptor */
@ -272,7 +271,6 @@ struct usb_device_descriptor {
#define USB_DT_DEVICE_SIZE 18 #define USB_DT_DEVICE_SIZE 18
/* /*
* Device and/or Interface Class codes * Device and/or Interface Class codes
* as found in bDeviceClass or bInterfaceClass * as found in bDeviceClass or bInterfaceClass
@ -703,7 +701,6 @@ struct usb_qualifier_descriptor {
__u8 bRESERVED; __u8 bRESERVED;
} __attribute__ ((packed)); } __attribute__ ((packed));
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* USB_DT_OTG (from OTG 1.0a supplement) */ /* USB_DT_OTG (from OTG 1.0a supplement) */
@ -745,7 +742,6 @@ struct usb_interface_assoc_descriptor {
__u8 iFunction; __u8 iFunction;
} __attribute__ ((packed)); } __attribute__ ((packed));
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* USB_DT_SECURITY: group of wireless security descriptors, including /* USB_DT_SECURITY: group of wireless security descriptors, including
@ -789,7 +785,6 @@ struct usb_encryption_descriptor {
__u8 bAuthKeyIndex; __u8 bAuthKeyIndex;
} __attribute__((packed)); } __attribute__((packed));
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* USB_DT_BOS: group of device-level capabilities */ /* USB_DT_BOS: group of device-level capabilities */

4
include/linux/usb/gadget.h
View file

@ -446,7 +446,6 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep)
ep->ops->fifo_flush(ep); ep->ops->fifo_flush(ep);
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
struct usb_dcd_config_params { struct usb_dcd_config_params {
@ -567,7 +566,6 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
#define gadget_for_each_ep(tmp, gadget) \ #define gadget_for_each_ep(tmp, gadget) \
list_for_each_entry(tmp, &(gadget)->ep_list, ep_list) list_for_each_entry(tmp, &(gadget)->ep_list, ep_list)
/** /**
* gadget_is_dualspeed - return true iff the hardware handles high speed * gadget_is_dualspeed - return true iff the hardware handles high speed
* @g: controller that might support both high and full speeds * @g: controller that might support both high and full speeds
@ -769,7 +767,6 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
return gadget->ops->pullup(gadget, 0); return gadget->ops->pullup(gadget, 0);
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/** /**
@ -856,7 +853,6 @@ struct usb_gadget_driver {
void (*reset)(struct usb_gadget *); void (*reset)(struct usb_gadget *);
}; };
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* driver modules register and unregister, as usual. /* driver modules register and unregister, as usual.

1
include/linux/usb/musb.h
View file

@ -128,7 +128,6 @@ struct musb_hdrc_platform_data {
const void *platform_ops; const void *platform_ops;
}; };
/* TUSB 6010 support */ /* TUSB 6010 support */
#define TUSB6010_OSCCLK_60 16667 /* psec/clk @ 60.0 MHz */ #define TUSB6010_OSCCLK_60 16667 /* psec/clk @ 60.0 MHz */

4
include/linux/zstd_errors.h
View file

@ -11,11 +11,9 @@
#ifndef ZSTD_ERRORS_H_398273423 #ifndef ZSTD_ERRORS_H_398273423
#define ZSTD_ERRORS_H_398273423 #define ZSTD_ERRORS_H_398273423
/*===== dependency =====*/ /*===== dependency =====*/
#include <linux/types.h> /* size_t */ #include <linux/types.h> /* size_t */
/* ===== ZSTDERRORLIB_API : control library symbols visibility ===== */ /* ===== ZSTDERRORLIB_API : control library symbols visibility ===== */
#define ZSTDERRORLIB_VISIBILITY #define ZSTDERRORLIB_VISIBILITY
#define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBILITY #define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBILITY
@ -72,6 +70,4 @@ typedef enum {
ZSTDERRORLIB_API ZSTD_ErrorCode ZSTD_getErrorCode(size_t functionResult); ZSTDERRORLIB_API ZSTD_ErrorCode ZSTD_getErrorCode(size_t functionResult);
ZSTDERRORLIB_API const char* ZSTD_getErrorString(ZSTD_ErrorCode code); /*< Same as ZSTD_getErrorName, but using a `ZSTD_ErrorCode` enum argument */ ZSTDERRORLIB_API const char* ZSTD_getErrorString(ZSTD_ErrorCode code); /*< Same as ZSTD_getErrorName, but using a `ZSTD_ErrorCode` enum argument */
#endif /* ZSTD_ERRORS_H_398273423 */ #endif /* ZSTD_ERRORS_H_398273423 */

42
include/linux/zstd_lib.h
View file

@ -14,7 +14,6 @@
/* ====== Dependency ======*/ /* ====== Dependency ======*/
#include <linux/types.h> /* size_t */ #include <linux/types.h> /* size_t */
/* ===== ZSTDLIB_API : control library symbols visibility ===== */ /* ===== ZSTDLIB_API : control library symbols visibility ===== */
#ifndef ZSTDLIB_VISIBLE #ifndef ZSTDLIB_VISIBLE
# if (__GNUC__ >= 4) && !defined(__MINGW32__) # if (__GNUC__ >= 4) && !defined(__MINGW32__)
@ -27,7 +26,6 @@
#endif #endif
#define ZSTDLIB_API ZSTDLIB_VISIBLE #define ZSTDLIB_API ZSTDLIB_VISIBLE
/* ***************************************************************************** /* *****************************************************************************
Introduction Introduction
@ -100,7 +98,6 @@ ZSTDLIB_API const char* ZSTD_versionString(void);
#define ZSTD_BLOCKSIZELOG_MAX 17 #define ZSTD_BLOCKSIZELOG_MAX 17
#define ZSTD_BLOCKSIZE_MAX (1<<ZSTD_BLOCKSIZELOG_MAX) #define ZSTD_BLOCKSIZE_MAX (1<<ZSTD_BLOCKSIZELOG_MAX)
/* ************************************* /* *************************************
* Simple API * Simple API
***************************************/ ***************************************/
@ -165,7 +162,6 @@ ZSTDLIB_API unsigned long long ZSTD_getDecompressedSize(const void* src, size_t
* or an error code if input is invalid */ * or an error code if input is invalid */
ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize); ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize);
/*====== Helper functions ======*/ /*====== Helper functions ======*/
#define ZSTD_COMPRESSBOUND(srcSize) ((srcSize) + ((srcSize)>>8) + (((srcSize) < (128<<10)) ? (((128<<10) - (srcSize)) >> 11) /* margin, from 64 to 0 */ : 0)) /* this formula ensures that bound(A) + bound(B) <= bound(A+B) as long as A and B >= 128 KB */ #define ZSTD_COMPRESSBOUND(srcSize) ((srcSize) + ((srcSize)>>8) + (((srcSize) < (128<<10)) ? (((128<<10) - (srcSize)) >> 11) /* margin, from 64 to 0 */ : 0)) /* this formula ensures that bound(A) + bound(B) <= bound(A+B) as long as A and B >= 128 KB */
ZSTDLIB_API size_t ZSTD_compressBound(size_t srcSize); /*!< maximum compressed size in worst case single-pass scenario */ ZSTDLIB_API size_t ZSTD_compressBound(size_t srcSize); /*!< maximum compressed size in worst case single-pass scenario */
@ -175,7 +171,6 @@ ZSTDLIB_API int ZSTD_minCLevel(void); /*!< minimum negativ
ZSTDLIB_API int ZSTD_maxCLevel(void); /*!< maximum compression level available */ ZSTDLIB_API int ZSTD_maxCLevel(void); /*!< maximum compression level available */
ZSTDLIB_API int ZSTD_defaultCLevel(void); /*!< default compression level, specified by ZSTD_CLEVEL_DEFAULT, requires v1.5.0+ */ ZSTDLIB_API int ZSTD_defaultCLevel(void); /*!< default compression level, specified by ZSTD_CLEVEL_DEFAULT, requires v1.5.0+ */
/* ************************************* /* *************************************
* Explicit context * Explicit context
***************************************/ ***************************************/
@ -225,7 +220,6 @@ ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx,
void* dst, size_t dstCapacity, void* dst, size_t dstCapacity,
const void* src, size_t srcSize); const void* src, size_t srcSize);
/* ******************************************* /* *******************************************
* Advanced compression API (Requires v1.4.0+) * Advanced compression API (Requires v1.4.0+)
**********************************************/ **********************************************/
@ -243,7 +237,6 @@ ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx,
* In the future, we expect to remove from experimental API entry points which are redundant with this API. * In the future, we expect to remove from experimental API entry points which are redundant with this API.
*/ */
/* Compression strategies, listed from fastest to strongest */ /* Compression strategies, listed from fastest to strongest */
typedef enum { ZSTD_fast=1, typedef enum { ZSTD_fast=1,
ZSTD_dfast=2, ZSTD_dfast=2,
@ -513,7 +506,6 @@ ZSTDLIB_API size_t ZSTD_compress2( ZSTD_CCtx* cctx,
void* dst, size_t dstCapacity, void* dst, size_t dstCapacity,
const void* src, size_t srcSize); const void* src, size_t srcSize);
/* ********************************************* /* *********************************************
* Advanced decompression API (Requires v1.4.0+) * Advanced decompression API (Requires v1.4.0+)
************************************************/ ************************************************/
@ -578,7 +570,6 @@ ZSTDLIB_API size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param
*/ */
ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset); ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset);
/* ************************** /* **************************
* Streaming * Streaming
****************************/ ****************************/
@ -595,8 +586,6 @@ typedef struct ZSTD_outBuffer_s {
size_t pos; /*< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size */ size_t pos; /*< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size */
} ZSTD_outBuffer; } ZSTD_outBuffer;
/*-*********************************************************************** /*-***********************************************************************
* Streaming compression - HowTo * Streaming compression - HowTo
* *
@ -705,7 +694,6 @@ ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx,
ZSTD_inBuffer* input, ZSTD_inBuffer* input,
ZSTD_EndDirective endOp); ZSTD_EndDirective endOp);
/* These buffer sizes are softly recommended. /* These buffer sizes are softly recommended.
* They are not required : ZSTD_compressStream*() happily accepts any buffer size, for both input and output. * They are not required : ZSTD_compressStream*() happily accepts any buffer size, for both input and output.
* Respecting the recommended size just makes it a bit easier for ZSTD_compressStream*(), * Respecting the recommended size just makes it a bit easier for ZSTD_compressStream*(),
@ -722,7 +710,6 @@ ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx,
ZSTDLIB_API size_t ZSTD_CStreamInSize(void); /*< recommended size for input buffer */ ZSTDLIB_API size_t ZSTD_CStreamInSize(void); /*< recommended size for input buffer */
ZSTDLIB_API size_t ZSTD_CStreamOutSize(void); /*< recommended size for output buffer. Guarantee to successfully flush at least one complete compressed block. */ ZSTDLIB_API size_t ZSTD_CStreamOutSize(void); /*< recommended size for output buffer. Guarantee to successfully flush at least one complete compressed block. */
/* ***************************************************************************** /* *****************************************************************************
* This following is a legacy streaming API, available since v1.0+ . * This following is a legacy streaming API, available since v1.0+ .
* It can be replaced by ZSTD_CCtx_reset() and ZSTD_compressStream2(). * It can be replaced by ZSTD_CCtx_reset() and ZSTD_compressStream2().
@ -751,7 +738,6 @@ ZSTDLIB_API size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output);
/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_end). */ /*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_end). */
ZSTDLIB_API size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output); ZSTDLIB_API size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output);
/*-*************************************************************************** /*-***************************************************************************
* Streaming decompression - HowTo * Streaming decompression - HowTo
* *
@ -799,7 +785,6 @@ ZSTDLIB_API size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* outp
ZSTDLIB_API size_t ZSTD_DStreamInSize(void); /*!< recommended size for input buffer */ ZSTDLIB_API size_t ZSTD_DStreamInSize(void); /*!< recommended size for input buffer */
ZSTDLIB_API size_t ZSTD_DStreamOutSize(void); /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */ ZSTDLIB_API size_t ZSTD_DStreamOutSize(void); /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */
/* ************************ /* ************************
* Simple dictionary API * Simple dictionary API
***************************/ ***************************/
@ -827,7 +812,6 @@ ZSTDLIB_API size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx,
const void* src, size_t srcSize, const void* src, size_t srcSize,
const void* dict,size_t dictSize); const void* dict,size_t dictSize);
/* ********************************* /* *********************************
* Bulk processing dictionary API * Bulk processing dictionary API
**********************************/ **********************************/
@ -863,7 +847,6 @@ ZSTDLIB_API size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx,
const void* src, size_t srcSize, const void* src, size_t srcSize,
const ZSTD_CDict* cdict); const ZSTD_CDict* cdict);
typedef struct ZSTD_DDict_s ZSTD_DDict; typedef struct ZSTD_DDict_s ZSTD_DDict;
/*! ZSTD_createDDict() : /*! ZSTD_createDDict() :
@ -884,7 +867,6 @@ ZSTDLIB_API size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx,
const void* src, size_t srcSize, const void* src, size_t srcSize,
const ZSTD_DDict* ddict); const ZSTD_DDict* ddict);
/* ****************************** /* ******************************
* Dictionary helper functions * Dictionary helper functions
*******************************/ *******************************/
@ -919,7 +901,6 @@ ZSTDLIB_API unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict);
* When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code. */ * When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code. */
ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize); ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize);
/* ***************************************************************************** /* *****************************************************************************
* Advanced dictionary and prefix API (Requires v1.4.0+) * Advanced dictionary and prefix API (Requires v1.4.0+)
* *
@ -929,7 +910,6 @@ ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize);
* ZSTD_reset_session_and_parameters. Prefixes are single-use. * ZSTD_reset_session_and_parameters. Prefixes are single-use.
******************************************************************************/ ******************************************************************************/
/*! ZSTD_CCtx_loadDictionary() : Requires v1.4.0+ /*! ZSTD_CCtx_loadDictionary() : Requires v1.4.0+
* Create an internal CDict from `dict` buffer. * Create an internal CDict from `dict` buffer.
* Decompression will have to use same dictionary. * Decompression will have to use same dictionary.
@ -1052,7 +1032,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict);
#endif /* ZSTD_H_235446 */ #endif /* ZSTD_H_235446 */
/* ************************************************************************************** /* **************************************************************************************
* ADVANCED AND EXPERIMENTAL FUNCTIONS * ADVANCED AND EXPERIMENTAL FUNCTIONS
**************************************************************************************** ****************************************************************************************
@ -1123,7 +1102,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict);
#define ZSTD_STRATEGY_MIN ZSTD_fast #define ZSTD_STRATEGY_MIN ZSTD_fast
#define ZSTD_STRATEGY_MAX ZSTD_btultra2 #define ZSTD_STRATEGY_MAX ZSTD_btultra2
#define ZSTD_OVERLAPLOG_MIN 0 #define ZSTD_OVERLAPLOG_MIN 0
#define ZSTD_OVERLAPLOG_MAX 9 #define ZSTD_OVERLAPLOG_MAX 9
@ -1133,7 +1111,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict);
* This limit can be overridden using ZSTD_DCtx_setParameter(,ZSTD_d_windowLogMax,). * This limit can be overridden using ZSTD_DCtx_setParameter(,ZSTD_d_windowLogMax,).
* The limit does not apply for one-pass decoders (such as ZSTD_decompress()), since no additional memory is allocated */ * The limit does not apply for one-pass decoders (such as ZSTD_decompress()), since no additional memory is allocated */
/* LDM parameter bounds */ /* LDM parameter bounds */
#define ZSTD_LDM_HASHLOG_MIN ZSTD_HASHLOG_MIN #define ZSTD_LDM_HASHLOG_MIN ZSTD_HASHLOG_MIN
#define ZSTD_LDM_HASHLOG_MAX ZSTD_HASHLOG_MAX #define ZSTD_LDM_HASHLOG_MAX ZSTD_HASHLOG_MAX
@ -1149,7 +1126,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict);
#define ZSTD_TARGETCBLOCKSIZE_MAX ZSTD_BLOCKSIZE_MAX #define ZSTD_TARGETCBLOCKSIZE_MAX ZSTD_BLOCKSIZE_MAX
#define ZSTD_SRCSIZEHINT_MIN 0 #define ZSTD_SRCSIZEHINT_MIN 0
/* --- Advanced types --- */ /* --- Advanced types --- */
typedef struct ZSTD_CCtx_params_s ZSTD_CCtx_params; typedef struct ZSTD_CCtx_params_s ZSTD_CCtx_params;
@ -1417,7 +1393,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_compressSequences(ZSTD_CCtx* const cctx, void* ds
const ZSTD_Sequence* inSeqs, size_t inSeqsSize, const ZSTD_Sequence* inSeqs, size_t inSeqsSize,
const void* src, size_t srcSize); const void* src, size_t srcSize);
/*! ZSTD_writeSkippableFrame() : /*! ZSTD_writeSkippableFrame() :
* Generates a zstd skippable frame containing data given by src, and writes it to dst buffer. * Generates a zstd skippable frame containing data given by src, and writes it to dst buffer.
* *
@ -1453,8 +1428,6 @@ ZSTDLIB_API size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity, unsign
*/ */
ZSTDLIB_API unsigned ZSTD_isSkippableFrame(const void* buffer, size_t size); ZSTDLIB_API unsigned ZSTD_isSkippableFrame(const void* buffer, size_t size);
/* ************************************* /* *************************************
* Memory management * Memory management
***************************************/ ***************************************/
@ -1555,7 +1528,6 @@ ZSTDLIB_STATIC_API const ZSTD_DDict* ZSTD_initStaticDDict(
ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictLoadMethod_e dictLoadMethod,
ZSTD_dictContentType_e dictContentType); ZSTD_dictContentType_e dictContentType);
/*! Custom memory allocation : /*! Custom memory allocation :
* These prototypes make it possible to pass your own allocation/free functions. * These prototypes make it possible to pass your own allocation/free functions.
* ZSTD_customMem is provided at creation time, using ZSTD_create*_advanced() variants listed below. * ZSTD_customMem is provided at creation time, using ZSTD_create*_advanced() variants listed below.
@ -1594,7 +1566,6 @@ ZSTDLIB_STATIC_API ZSTD_threadPool* ZSTD_createThreadPool(size_t numThreads);
ZSTDLIB_STATIC_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool); /* accept NULL pointer */ ZSTDLIB_STATIC_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool); /* accept NULL pointer */
ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool); ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool);
/* /*
* This API is temporary and is expected to change or disappear in the future! * This API is temporary and is expected to change or disappear in the future!
*/ */
@ -1611,7 +1582,6 @@ ZSTDLIB_STATIC_API ZSTD_DDict* ZSTD_createDDict_advanced(
ZSTD_dictContentType_e dictContentType, ZSTD_dictContentType_e dictContentType,
ZSTD_customMem customMem); ZSTD_customMem customMem);
/* ************************************* /* *************************************
* Advanced compression functions * Advanced compression functions
***************************************/ ***************************************/
@ -1669,7 +1639,6 @@ size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx,
const ZSTD_CDict* cdict, const ZSTD_CDict* cdict,
ZSTD_frameParameters fParams); ZSTD_frameParameters fParams);
/*! ZSTD_CCtx_loadDictionary_byReference() : /*! ZSTD_CCtx_loadDictionary_byReference() :
* Same as ZSTD_CCtx_loadDictionary(), but dictionary content is referenced, instead of being copied into CCtx. * Same as ZSTD_CCtx_loadDictionary(), but dictionary content is referenced, instead of being copied into CCtx.
* It saves some memory, but also requires that `dict` outlives its usage within `cctx` */ * It saves some memory, but also requires that `dict` outlives its usage within `cctx` */
@ -1933,7 +1902,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const vo
*/ */
ZSTDLIB_STATIC_API size_t ZSTD_CCtx_getParameter(const ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value); ZSTDLIB_STATIC_API size_t ZSTD_CCtx_getParameter(const ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value);
/*! ZSTD_CCtx_params : /*! ZSTD_CCtx_params :
* Quick howto : * Quick howto :
* - ZSTD_createCCtxParams() : Create a ZSTD_CCtx_params structure * - ZSTD_createCCtxParams() : Create a ZSTD_CCtx_params structure
@ -2010,7 +1978,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_compressStream2_simpleArgs (
const void* src, size_t srcSize, size_t* srcPos, const void* src, size_t srcSize, size_t* srcPos,
ZSTD_EndDirective endOp); ZSTD_EndDirective endOp);
/* ************************************* /* *************************************
* Advanced decompression functions * Advanced decompression functions
***************************************/ ***************************************/
@ -2135,7 +2102,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParamete
*/ */
#define ZSTD_d_refMultipleDDicts ZSTD_d_experimentalParam4 #define ZSTD_d_refMultipleDDicts ZSTD_d_experimentalParam4
/*! ZSTD_DCtx_setFormat() : /*! ZSTD_DCtx_setFormat() :
* This function is REDUNDANT. Prefer ZSTD_DCtx_setParameter(). * This function is REDUNDANT. Prefer ZSTD_DCtx_setParameter().
* Instruct the decoder context about what kind of data to decode next. * Instruct the decoder context about what kind of data to decode next.
@ -2156,7 +2122,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_decompressStream_simpleArgs (
void* dst, size_t dstCapacity, size_t* dstPos, void* dst, size_t dstCapacity, size_t* dstPos,
const void* src, size_t srcSize, size_t* srcPos); const void* src, size_t srcSize, size_t* srcPos);
/* ****************************************************************** /* ******************************************************************
* Advanced streaming functions * Advanced streaming functions
* Warning : most of these functions are now redundant with the Advanced API. * Warning : most of these functions are now redundant with the Advanced API.
@ -2274,7 +2239,6 @@ size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs,
ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions")
size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize); size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize);
typedef struct { typedef struct {
unsigned long long ingested; /* nb input bytes read and buffered */ unsigned long long ingested; /* nb input bytes read and buffered */
unsigned long long consumed; /* nb input bytes actually compressed */ unsigned long long consumed; /* nb input bytes actually compressed */
@ -2307,7 +2271,6 @@ ZSTDLIB_STATIC_API ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCt
*/ */
ZSTDLIB_STATIC_API size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx); ZSTDLIB_STATIC_API size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx);
/*===== Advanced Streaming decompression functions =====*/ /*===== Advanced Streaming decompression functions =====*/
/*! /*!
@ -2342,7 +2305,6 @@ ZSTDLIB_STATIC_API size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* zds, const Z
*/ */
ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds);
/* ******************************************************************* /* *******************************************************************
* Buffer-less and synchronous inner streaming functions * Buffer-less and synchronous inner streaming functions
* *
@ -2504,9 +2466,6 @@ ZSTDLIB_STATIC_API void ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* prepar
typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e; typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e;
ZSTDLIB_STATIC_API ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx); ZSTDLIB_STATIC_API ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx);
/* ============================ */ /* ============================ */
/* Block level API */ /* Block level API */
/* ============================ */ /* ============================ */
@ -2544,6 +2503,5 @@ ZSTDLIB_STATIC_API size_t ZSTD_compressBlock (ZSTD_CCtx* cctx, void* dst, size_
ZSTDLIB_STATIC_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); ZSTDLIB_STATIC_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
ZSTDLIB_STATIC_API size_t ZSTD_insertBlock (ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize); /*< insert uncompressed block into `dctx` history. Useful for multi-blocks decompression. */ ZSTDLIB_STATIC_API size_t ZSTD_insertBlock (ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize); /*< insert uncompressed block into `dctx` history. Useful for multi-blocks decompression. */
#endif /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */ #endif /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */