upstream/mercurial-mirror Files · contrib/python-zstandard/zstd/decompress/zstd_ddict.h

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Gregory Szorc - - Load All Authors

File last commit:

r42237:675775c3 default


                r49398:60a06b0d

default

Download file

             zstd_ddict.h
        
                    44 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / python-zstandard / zstd / decompress / zstd_ddict.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.

       * All rights reserved.

       *

       * This source code is licensed under both the BSD-style license (found in the

       * LICENSE file in the root directory of this source tree) and the GPLv2 (found

       * in the COPYING file in the root directory of this source tree).

       * You may select, at your option, one of the above-listed licenses.

       */

      #ifndef ZSTD_DDICT_H

      #define ZSTD_DDICT_H

      /*-*******************************************************

       *  Dependencies

       *********************************************************/

      #include <stddef.h>   /* size_t */

      #include "zstd.h"     /* ZSTD_DDict, and several public functions */

      /*-*******************************************************

       *  Interface

       *********************************************************/

      /* note: several prototypes are already published in `zstd.h` :

       * ZSTD_createDDict()

       * ZSTD_createDDict_byReference()

       * ZSTD_createDDict_advanced()

       * ZSTD_freeDDict()

       * ZSTD_initStaticDDict()

       * ZSTD_sizeof_DDict()

       * ZSTD_estimateDDictSize()

       * ZSTD_getDictID_fromDict()

       */

      const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict);

      size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict);

      void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);

      #endif /* ZSTD_DDICT_H */

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				/*
				* Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
				* All rights reserved.
				*
				* This source code is licensed under both the BSD-style license (found in the
				* LICENSE file in the root directory of this source tree) and the GPLv2 (found
				* in the COPYING file in the root directory of this source tree).
				* You may select, at your option, one of the above-listed licenses.
				*/


				#ifndef ZSTD_DDICT_H
				#define ZSTD_DDICT_H

				/-******************************************************
				* Dependencies
				*********************************************************/
				#include <stddef.h> /* size_t */
				#include "zstd.h" /* ZSTD_DDict, and several public functions */


				/-******************************************************
				* Interface
				*********************************************************/

				/* note: several prototypes are already published in `zstd.h` :
				* ZSTD_createDDict()
				* ZSTD_createDDict_byReference()
				* ZSTD_createDDict_advanced()
				* ZSTD_freeDDict()
				* ZSTD_initStaticDDict()
				* ZSTD_sizeof_DDict()
				* ZSTD_estimateDDictSize()
				* ZSTD_getDictID_fromDict()
				*/

				const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict);
				size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict);

				void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict);



				#endif /* ZSTD_DDICT_H */