Skip to content

Fixed some minor bugs #30

Open
namedun wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed some minor bugs #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
273f2ca
Build frugen with shared library instead of static
namedun Feb 22, 2023
a982b1a
Fix invalid memcmp size
namedun Feb 22, 2023
1342979
Fix invalid arguments when calling fatal()
namedun Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ add_library(fru-shared SHARED fru.c)
find_library(JSON_LIB json-c)
SET_TARGET_PROPERTIES(fru-static PROPERTIES OUTPUT_NAME fru CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(fru-shared PROPERTIES OUTPUT_NAME fru CLEAN_DIRECT_OUTPUT 1)
target_link_libraries(frugen fru-static)
target_link_libraries(frugen fru-shared)
target_link_libraries(frugen-static fru-static -static)
if (JSON_LIB)
message (STATUS "Using JSON Library found at " ${JSON_LIB})
Expand Down
2 changes: 1 addition & 1 deletion fru.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ fru_info_area_t *fru_create_info_area(fru_area_type_t atype, ///< [in] Area t
* It's assumed here that UNIX time 0 (Jan 1st of 1970)
* can never actually happen in a FRU file in 2018.
*/
if (!memcmp(&tv_unspecified, tv, sizeof(tv))) {
if (!memcmp(&tv_unspecified, tv, sizeof(*tv))) {
printf("Using FRU_DATE_UNSPECIFIED\n");
fru_time = FRU_DATE_UNSPECIFIED;
} else {
Expand Down
2 changes: 1 addition & 1 deletion frugen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ bool json_fill_fru_area_fields(json_object *jso, int count,
const char *type = json_object_get_string(typefield);
const char *val = json_object_get_string(valfield);
if (!strcmp("binary", type)) {
fatal(1, "Binary format not yet implemented");
fatal("Binary format not yet implemented");
} else if (!strcmp("bcdplus", type)) {
fields[i]->type = FIELD_TYPE_BCDPLUS;
} else if (!strcmp("6bitascii", type)) {
Expand Down