8000 Merge pull request #6122 from libgit2/ethomson/cleanup · Murmele/libgit2@6fdb1b2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6fdb1b2

Browse files
ethomsonethomson
authored
Merge pull request libgit2#6122 from libgit2/ethomson/cleanup
Minor code cleanups
2 parents f9c4dc1 + 84083dc commit 6fdb1b2

29 files changed

+60
-70
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.5.1)
66
project(libgit2 VERSION "1.3.0" LANGUAGES C)
77

88
# Add find modules to the path
9-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake")
9+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
1010

1111
#
1212
# Build options

‎cmake/IdeSplitSources.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function(IDE_SPLIT_SOURCES target)
88
get_target_property(sources ${target} SOURCES)
99
foreach(source ${sources})
1010
if(source MATCHES ".*/")
11-
string(REPLACE ${libgit2_SOURCE_DIR}/ "" rel ${source})
11+
string(REPLACE ${CMAKE_SOURCE_DIR}/ "" rel ${source})
1212
if(rel)
1313
string(REGEX REPLACE "/([^/]*)$" "" rel ${rel})
1414
if(rel)

‎cmake/SelectHTTPParser.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ if(USE_HTTP_PARSER STREQUAL "system")
1212
endif()
1313
else()
1414
message(STATUS "http-parser version 2 was not found or disabled; using bundled 3rd-party sources.")
15-
add_subdirectory("${libgit2_SOURCE_DIR}/deps/http-parser" "${libgit2_BINARY_DIR}/deps/http-parser")
16-
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${libgit2_SOURCE_DIR}/deps/http-parser")
15+
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/http-parser" "${CMAKE_BINARY_DIR}/deps/http-parser")
16+
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${CMAKE_SOURCE_DIR}/deps/http-parser")
1717
list(APPEND LIBGIT2_DEPENDENCY_OBJECTS "$<TARGET_OBJECTS:http-parser>")
1818
add_feature_info(http-parser ON "http-parser support (bundled)")
1919
endif()

‎cmake/SelectRegex.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ elseif(REGEX_BACKEND STREQUAL "builtin")
4343
add_feature_info(regex ON "using bundled PCRE")
4444
set(GIT_REGEX_BUILTIN 1)
4545

46-
add_subdirectory("${libgit2_SOURCE_DIR}/deps/pcre" "${libgit2_BINARY_DIR}/deps/pcre")
47-
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${libgit2_SOURCE_DIR}/deps/pcre")
46+
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/pcre" "${CMAKE_BINARY_DIR}/deps/pcre")
47+
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${CMAKE_SOURCE_DIR}/deps/pcre")
4848
list(APPEND LIBGIT2_DEPENDENCY_OBJECTS $<TARGET_OBJECTS:pcre>)
4949
else()
5050
message(FATAL_ERROR "The REGEX_BACKEND option provided is not supported")

‎cmake/SelectWinHTTP.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ if(WIN32 AND USE_WINHTTP)
44
# Since MinGW does not come with headers or an import library for winhttp,
55
# we have to include a private header and generate our own import library
66
if(MINGW)
7-
add_subdirectory("${libgit2_SOURCE_DIR}/deps/winhttp" "${libgit2_BINARY_DIR}/deps/winhttp")
7+
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/winhttp" "${CMAKE_BINARY_DIR}/deps/winhttp")
88
list(APPEND LIBGIT2_SYSTEM_LIBS winhttp)
9-
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${libgit2_SOURCE_DIR}/deps/winhttp")
9+
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${CMAKE_SOURCE_DIR}/deps/winhttp")
1010
else()
1111
list(APPEND LIBGIT2_SYSTEM_LIBS "winhttp")
1212
list(APPEND LIBGIT2_PC_LIBS "-lwinhttp")

‎cmake/SelectZlib.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ if(USE_BUNDLED_ZLIB STREQUAL "OFF")
2222
endif()
2323
endif()
2424
if(USE_BUNDLED_ZLIB STREQUAL "Chromium")
25-
add_subdirectory("${libgit2_SOURCE_DIR}/deps/chromium-zlib" "${libgit2_BINARY_DIR}/deps/chromium-zlib")
26-
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${libgit2_SOURCE_DIR}/deps/chromium-zlib")
25+
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/chromium-zlib" "${CMAKE_BINARY_DIR}/deps/chromium-zlib")
26+
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${CMAKE_SOURCE_DIR}/deps/chromium-zlib")
2727
list(APPEND LIBGIT2_DEPENDENCY_OBJECTS $<TARGET_OBJECTS:chromium_zlib>)
2828
add_feature_info(zlib ON "using (Chromium) bundled zlib")
2929
elseif(USE_BUNDLED_ZLIB OR NOT ZLIB_FOUND)
30-
add_subdirectory("${libgit2_SOURCE_DIR}/deps/zlib" "${libgit2_BINARY_DIR}/deps/zlib")
31-
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${libgit2_SOURCE_DIR}/deps/zlib")
30+
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/zlib" "${CMAKE_BINARY_DIR}/deps/zlib")
31+
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${CMAKE_SOURCE_DIR}/deps/zlib")
3232
list(APPEND LIBGIT2_DEPENDENCY_OBJECTS $<TARGET_OBJECTS:zlib>)
3333
add_feature_info(zlib ON "using bundled zlib")
3434
endif()

‎deps/winhttp/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ if(NOT DLLTOOL)
33
message(FATAL_ERROR "Could not find dlltool command")
44
endif()
55

6-
set(LIBWINHTTP_PATH "${libgit2_BINARY_DIR}/deps/winhttp")
6+
set(LIBWINHTTP_PATH "${CMAKE_BINARY_DIR}/deps/winhttp")
77
set(LIBWINHTTP_PATH ${LIBWINHTTP_PATH} PARENT_SCOPE)
88
file(MAKE_DIRECTORY ${LIBWINHTTP_PATH})
99

@@ -17,10 +17,8 @@ add_custom_command(
1717
OUTPUT ${LIBWINHT 6377 TP_PATH}/libwinhttp.a
1818
COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a
1919
DEPENDS ${WINHTTP_DEF}
20-
WORKING_DIRECTORY ${LIBWINHTTP_PATH}
21-
)
20+
WORKING_DIRECTORY ${LIBWINHTTP_PATH})
2221

2322
set_source_files_properties(
2423
${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c
25-
PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a
26-
)
24+
PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a)

‎src/CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ set(LIBGIT2_PC_LIBS "")
3636

3737
set(LIBGIT2_INCLUDES
3838
"${CMAKE_CURRENT_BINARY_DIR}"
39-
"${libgit2_SOURCE_DIR}/src"
40-
"${libgit2_SOURCE_DIR}/include")
39+
"${CMAKE_SOURCE_DIR}/src"
40+
"${CMAKE_SOURCE_DIR}/include")
4141

4242
if(HAVE_FUTIMENS)
4343
set(GIT_USE_FUTIMENS 1)
@@ -117,8 +117,8 @@ target_sources(git2internal PRIVATE ${SRC_SHA1})
117117
# Optional external dependency: ntlmclient
118118
if(USE_NTLMCLIENT)
119119
set(GIT_NTLM 1)
120-
add_subdirectory("${libgit2_SOURCE_DIR}/deps/ntlmclient" "${libgit2_BINARY_DIR}/deps/ntlmclient")
121-
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${libgit2_SOURCE_DIR}/deps/ntlmclient")
120+
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/ntlmclient" "${CMAKE_BINARY_DIR}/deps/ntlmclient")
121+
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${CMAKE_SOURCE_DIR}/deps/ntlmclient")
122122
list(APPEND LIBGIT2_DEPENDENCY_OBJECTS "$<TARGET_OBJECTS:ntlmclient>")
123123
endif()
124124
add_feature_info(ntlmclient GIT_NTLM "NTLM authentication support for Unix")
@@ -164,9 +164,9 @@ target_compile_definitions(git2internal PRIVATE _FILE_OFFSET_BITS=64)
164164

165165
# Collect sourcefiles
166166
file(GLOB SRC_H
167-
"${libgit2_SOURCE_DIR}/include/git2.h"
168-
"${libgit2_SOURCE_DIR}/include/git2/*.h"
169-
"${libgit2_SOURCE_DIR}/include/git2/sys/*.h")
167+
"${CMAKE_SOURCE_DIR}/include/git2.h"
168+
"${CMAKE_SOURCE_DIR}/include/git2/*.h"
169+
"${CMAKE_SOURCE_DIR}/include/git2/sys/*.h")
170170
list(SORT SRC_H)
171171
target_sources(git2internal PRIVATE ${SRC_H})
172172

@@ -225,7 +225,7 @@ configure_file(features.h.in git2/sys/features.h)
225225
ide_split_sources(git2internal)
226226
list(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:git2internal> ${LIBGIT2_DEPENDENCY_OBJECTS})
227227

228-
target_include_directories(git2internal PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${libgit2_SOURCE_DIR}/include)
228+
target_include_directories(git2internal PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${CMAKE_SOURCE_DIR}/include)
229229
target_include_directories(git2internal SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
230230

231231
set(LIBGIT2_INCLUDES ${LIBGIT2_INCLUDES} PARENT_SCOPE)
@@ -247,9 +247,9 @@ add_library(git2 ${WIN_RC} ${LIBGIT2_OBJECTS})
247247
target_link_libraries(git2 ${LIBGIT2_SYSTEM_LIBS})
248248

249249
set_target_properties(git2 PROPERTIES C_STANDARD 90)
250-
set_target_properties(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
251-
set_target_properties(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
252-
set_target_properties(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
250+
set_target_properties(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
251+
set_target_properties(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
252+
set_target_properties(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
253253

254254
# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
255255
# Win64+MSVC+static libs = linker error
@@ -290,5 +290,5 @@ install(TARGETS git2
290290
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
291291
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
292292
)
293-
install(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
294-
install(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
293+
install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
294+
install(FILES ${CMAKE_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

‎src/date.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#endif
1212

1313
#include "util.h"
14-
#include "cache.h"
1514
#include "posix.h"
1615
#include "date.h"
1716

‎src/filebuf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ int git_filebuf_open_withsize(git_filebuf *file, const char *path, int flags, mo
386386
return error;
387387
}
388388

389-
int git_filebuf_hash(git_oid *oid, git_filebuf *file)
389+
int git_filebuf_hash(unsigned char *out, git_filebuf *file)
390390
{
391-
GIT_ASSERT_ARG(oid);
391+
GIT_ASSERT_ARG(out);
392392
GIT_ASSERT_ARG(file);
393393
GIT_ASSERT_ARG(file->compute_digest);
394394

@@ -397,7 +397,7 @@ int git_filebuf_hash(git_oid *oid, git_filebuf *file)
397397
if (verify_last_error(file) < 0)
398398
return -1;
399399

400-
git_hash_final(oid->id, &file->digest);
400+
git_hash_final(out, &file->digest);
401401
git_hash_ctx_cleanup(&file->digest);
402402
file->compute_digest = 0;
403403

0 commit comments

Comments
 (0)
0