proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-03 22:01:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

caps: Rename to features to avoid confusion

Browse Source
This commit is contained in:
Vicent Marti 2014-03-03 12:09:17 +01:00
parent 494be429ad
commit c9f5298b0e
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/git2/common.h
View File

@ -94,29 +94,34 @@ GIT_BEGIN_DECL
GIT_EXTERN(void) git_libgit2_version(int *major, int *minor, int *rev);
/**
* Combinations of these values describe the capabilities of libgit2.
* Combinations of these values describe the features with which libgit2
* was compiled
*/
typedef enum {
GIT_CAP_THREADS = ( 1 << 0 ),
GIT_CAP_HTTPS = ( 1 << 1 ),
GIT_CAP_SSH = ( 1 << 2 ),
GIT_HAS_THREADS = (1 << 0),
GIT_HAS_HTTPS = (1 << 1),
GIT_HAS_SSH = (1 << 2),
} git_cap_t;
/**
* Query compile time options for libgit2.
*
* @return A combination of GIT_CAP_* values.
* @return A combination of GIT_HAS_* values.
*
* - GIT_CAP_THREADS
* - GIT_HAS_THREADS
* Libgit2 was compiled with thread support. Note that thread support is
* still to be seen as a 'work in progress' - basic object lookups are
* believed to be threadsafe, but other operations may not be.
*
* - GIT_CAP_HTTPS
* - GIT_HAS_HTTPS
* Libgit2 supports the https:// protocol. This requires the openssl
* library to be found when compiling libgit2.
*
* - GIT_HAS_SSH
* Libgit2 supports the SSH protocol for network operations. This requires
* the openssh to be found when compiling libgit2
*/
GIT_EXTERN(int) git_libgit2_capabilities(void);
GIT_EXTERN(int) git_libgit2_features(void);
typedef enum {

8
src/settings.c
View File

@ -17,17 +17,17 @@ void git_libgit2_version(int *major, int *minor, int *rev)
*rev = LIBGIT2_VER_REVISION;
}
int git_libgit2_capabilities()
int git_libgit2_features()
{
return 0
#ifdef GIT_THREADS
| GIT_CAP_THREADS
| GIT_HAS_THREADS
#endif
#if defined(GIT_SSL) || defined(GIT_WINHTTP)
| GIT_CAP_HTTPS
| GIT_HAS_HTTPS
#endif
#if defined(GIT_SSH)
| GIT_CAP_SSH
| GIT_HAS_SSH
#endif
;
}

16
tests/core/caps.c → tests/core/features.c
View File

@ -1,6 +1,6 @@
#include "clar_libgit2.h"
void test_core_caps__0(void)
void test_core_features__0(void)
{
int major, minor, rev, caps;
@ -9,23 +9,23 @@ void test_core_caps__0(void)
cl_assert_equal_i(LIBGIT2_VER_MINOR, minor);
cl_assert_equal_i(LIBGIT2_VER_REVISION, rev);
caps = git_libgit2_capabilities();
caps = git_libgit2_features();
#ifdef GIT_THREADS
cl_assert((caps & GIT_CAP_THREADS) != 0);
cl_assert((caps & GIT_HAS_THREADS) != 0);
#else
cl_assert((caps & GIT_CAP_THREADS) == 0);
cl_assert((caps & GIT_HAS_THREADS) == 0);
#endif
#if defined(GIT_SSL) || defined(GIT_WINHTTP)
cl_assert((caps & GIT_CAP_HTTPS) != 0);
cl_assert((caps & GIT_HAS_HTTPS) != 0);
#else
cl_assert((caps & GIT_CAP_HTTPS) == 0);
cl_assert((caps & GIT_HAS_HTTPS) == 0);
#endif
#if defined(GIT_SSH)
cl_assert((caps & GIT_CAP_SSH) != 0);
cl_assert((caps & GIT_HAS_SSH) != 0);
#else
cl_assert((caps & GIT_CAP_SSH) == 0);
cl_assert((caps & GIT_HAS_SSH) == 0);
#endif
}