Skip to content

Commit 6c2939d

Browse files
authored
Merge pull request libgit2#4646 from pks-t/pks/gcc-8.1-warnings
Fix GCC 8.1 warnings
2 parents 81ea995 + 1bf57b5 commit 6c2939d

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/streams/openssl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@ int git_openssl_stream_global_init(void)
252252
#if defined(GIT_THREADS)
253253
static void threadid_cb(CRYPTO_THREADID *threadid)
254254
{
255-
CRYPTO_THREADID_set_numeric(threadid, git_thread_currentid());
255+
GIT_UNUSED(threadid);
256+
CRYPTO_THREADID_set_numeric(threadid, git_thread_currentid());
256257
}
257258
#endif
258259

tests/iterator/workdir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ void test_iterator_workdir__icase_starts_and_ends(void)
460460
static void build_workdir_tree(const char *root, int dirs, int subs)
461461
{
462462
int i, j;
463-
char buf[64], sub[64];
463+
char buf[64], sub[80];
464464

465465
for (i = 0; i < dirs; ++i) {
466466
if (i % 2 == 0) {

tests/refs/normalize.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,7 @@ void test_refs_normalize__jgit_suite(void)
193193
char c;
194194
char buffer[GIT_REFNAME_MAX];
195195
for (c = '\1'; c < ' '; c++) {
196-
strncpy(buffer, "refs/heads/mast", 15);
197-
strncpy(buffer + 15, (const char *)&c, 1);
198-
strncpy(buffer + 16, "er", 2);
199-
buffer[18 - 1] = '\0';
196+
p_snprintf(buffer, sizeof(buffer), "refs/heads/mast%cer", c);
200197
ensure_refname_invalid(GIT_REF_FORMAT_ALLOW_ONELEVEL, buffer);
201198
}
202199
}

0 commit comments

Comments
 (0)