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

Merge pull request #1428 from xavier-l/nul-terminated-oid

Browse Source 
Nul terminated oid
This commit is contained in:
Vicent Martí 2013-03-25 13:26:50 -07:00
commit 1f10747854
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/git2/oid.h
View File

@ -46,6 +46,16 @@ typedef struct git_oid {
*/ */
GIT_EXTERN(int) git_oid_fromstr(git_oid *out, const char *str); GIT_EXTERN(int) git_oid_fromstr(git_oid *out, const char *str);
/**
* Parse a hex formatted null-terminated string into a git_oid.
*
* @param out oid structure the result is written into.
* @param str input hex string; must be at least 4 characters
* long and null-terminated.
* @return 0 or an error code
*/
GIT_EXTERN(int) git_oid_fromstrp(git_oid *out, const char *str);
/** /**
* Parse N characters of a hex formatted object id into a git_oid * Parse N characters of a hex formatted object id into a git_oid
* *

5
src/oid.c
View File

@ -51,6 +51,11 @@ int git_oid_fromstrn(git_oid *out, const char *str, size_t length)
return 0; return 0;
} }
int git_oid_fromstrp(git_oid *out, const char *str)
{
return git_oid_fromstrn(out, str, strlen(str));
}
int git_oid_fromstr(git_oid *out, const char *str) int git_oid_fromstr(git_oid *out, const char *str)
{ {
return git_oid_fromstrn(out, str, GIT_OID_HEXSZ); return git_oid_fromstrn(out, str, GIT_OID_HEXSZ);

14
tests-clar/core/oid.c
View File

@ -1,11 +1,17 @@
#include "clar_libgit2.h" #include "clar_libgit2.h"
static git_oid id; static git_oid id;
static git_oid idp;
static git_oid idm;
const char *str_oid = "ae90f12eea699729ed24555e40b9fd669da12a12"; const char *str_oid = "ae90f12eea699729ed24555e40b9fd669da12a12";
const char *str_oid_p = "ae90f12eea699729ed";
const char *str_oid_m = "ae90f12eea699729ed24555e40b9fd669da12a12THIS IS EXTRA TEXT THAT SHOULD GET IGNORED";
void test_core_oid__initialize(void) void test_core_oid__initialize(void)
{ {
cl_git_pass(git_oid_fromstr(&id, str_oid)); cl_git_pass(git_oid_fromstr(&id, str_oid));
cl_git_pass(git_oid_fromstrp(&idp, str_oid_p));
cl_git_pass(git_oid_fromstrp(&idm, str_oid_m));
} }
void test_core_oid__streq(void) void test_core_oid__streq(void)
@ -15,4 +21,12 @@ void test_core_oid__streq(void)
cl_assert(git_oid_streq(&id, "deadbeef") == -1); cl_assert(git_oid_streq(&id, "deadbeef") == -1);
cl_assert(git_oid_streq(&id, "I'm not an oid.... :)") == -1); cl_assert(git_oid_streq(&id, "I'm not an oid.... :)") == -1);
cl_assert(git_oid_streq(&idp, "ae90f12eea699729ed0000000000000000000000") == 0);
cl_assert(git_oid_streq(&idp, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef") == -1);
cl_assert(git_oid_streq(&idp, "deadbeef") == -1);
cl_assert(git_oid_streq(&idp, "I'm not an oid.... :)") == -1);
cl_assert(git_oid_cmp(&id, &idm) == 0);
} }