admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dd/sparse-fixes'

Browse Source 
Compilation fix.

* dd/sparse-fixes:
  progress.c: silence cgcc suggestion about internal linkage
  graph.c: limit linkage of internal variable
  compat/regex: move stdlib.h up in inclusion chain
  test-parse-pathspec-file.c: s/0/NULL/ for pointer type
This commit is contained in:
Junio C Hamano
2020-05-01 13:39:56 -07:00
parent 3e68f552f3 3cacb9aaf4
commit bf04590ecd
8 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/helper/test-parse-pathspec-file.c
View File

@@ -6,7 +6,7 @@
int cmd__parse_pathspec_file(int argc, const char **argv)
{
struct pathspec pathspec;
const char *pathspec_from_file = 0;
const char *pathspec_from_file = NULL;
int pathspec_file_nul = 0, i;
static const char *const usage[] = {
@@ -20,9 +20,9 @@ int cmd__parse_pathspec_file(int argc, const char **argv)
OPT_END()
};
parse_options(argc, argv, 0, options, usage, 0);
parse_options(argc, argv, NULL, options, usage, 0);
parse_pathspec_file(&pathspec, 0, 0, 0, pathspec_from_file,
parse_pathspec_file(&pathspec, 0, 0, NULL, pathspec_from_file,
pathspec_file_nul);
for (i = 0; i < pathspec.nr; i++)

9
t/helper/test-progress.c
View File

@@ -13,20 +13,13 @@
*
* See 't0500-progress-display.sh' for examples.
*/
#define GIT_TEST_PROGRESS_ONLY
#include "test-tool.h"
#include "gettext.h"
#include "parse-options.h"
#include "progress.h"
#include "strbuf.h"
/*
* These are defined in 'progress.c', but are not exposed in 'progress.h',
* because they are exclusively for testing.
*/
extern int progress_testing;
extern uint64_t progress_test_ns;
void progress_test_force_update(void);
int cmd__progress(int argc, const char **argv)
{
int total = 0;