Skip to content

Commit

Permalink
Merge pull request #2526 from jimklimov/issue-2523-cleanup
Browse files Browse the repository at this point in the history 
Assorted codebase cleanup while preparing work for issue #2523
  • Loading branch information
@jimklimov
jimklimov authored Jul 10, 2024
2 parents 6e0e2fc + d710ade commit c91684f
Show file tree
Hide file tree
Showing 18 changed files with 238 additions and 202 deletions.
5 changes: 5 additions & 0 deletions UPGRADING.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ Changes from 2.8.2 to 2.8.3
symlinks). Packaging recipes can likely be simplified now: some distros
certainly did patch NUT source to similar effect). [#2431]
- Numerous changes to `nut-scanner` and symbols that its `libnutscan.so`
delivers have caused a library version bump. New methods have been added
in a (hopefully) backwards compatible manner. [issue #2244 and numerous
PRs for it]
- Internal API change for `sendsignalpid()` and `sendsignalfn()` methods,
which can impact NUT forks which build using `libcommon.la` and similar
libraries. Added new last argument with `const char *progname` (may be
Expand Down
2 changes: 1 addition & 1 deletion clients/upsclient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#endif

#if defined HAVE_SYS_TYPES_H
#include <sys/types.h>
# include <sys/types.h>
#endif

#ifdef __cplusplus
Expand Down
83 changes: 42 additions & 41 deletions drivers/nut-libfreeipmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <freeipmi/freeipmi.h>
#include <ipmi_monitoring.h>
#if HAVE_FREEIPMI_MONITORING
#include <ipmi_monitoring_bitmasks.h>
# include <ipmi_monitoring_bitmasks.h>
#endif
#include "nut-ipmi.h"
#include "nut_stdint.h"
Expand All @@ -69,41 +69,41 @@ static ipmi_monitoring_ctx_t mon_ctx = NULL;
#ifdef HAVE_FREEIPMI_11X_12X
static ipmi_sdr_ctx_t sdr_ctx = NULL;
static ipmi_fru_ctx_t fru_ctx = NULL;
#define SDR_PARSE_CTX sdr_ctx
#define NUT_IPMI_SDR_CACHE_DEFAULTS IPMI_SDR_CACHE_CREATE_FLAGS_DEFAULT
# define SDR_PARSE_CTX sdr_ctx
# define NUT_IPMI_SDR_CACHE_DEFAULTS IPMI_SDR_CACHE_CREATE_FLAGS_DEFAULT
#else
static ipmi_sdr_cache_ctx_t sdr_ctx = NULL;
static ipmi_sdr_parse_ctx_t sdr_parse_ctx = NULL;
#define SDR_PARSE_CTX sdr_parse_ctx
# define SDR_PARSE_CTX sdr_parse_ctx
static ipmi_fru_parse_ctx_t fru_ctx = NULL;
/* Functions remapping */
#define ipmi_sdr_ctx_create ipmi_sdr_cache_ctx_create
#define ipmi_sdr_ctx_destroy ipmi_sdr_cache_ctx_destroy
#define ipmi_sdr_ctx_errnum ipmi_sdr_cache_ctx_errnum
#define ipmi_sdr_ctx_errormsg ipmi_sdr_cache_ctx_errormsg
#define ipmi_fru_ctx_create ipmi_fru_parse_ctx_create
#define ipmi_fru_ctx_destroy ipmi_fru_parse_ctx_destroy
#define ipmi_fru_ctx_set_flags ipmi_fru_parse_ctx_set_flags
#define ipmi_fru_ctx_strerror ipmi_fru_parse_ctx_strerror
#define ipmi_fru_ctx_errnum ipmi_fru_parse_ctx_errnum
#define ipmi_fru_open_device_id ipmi_fru_parse_open_device_id
#define ipmi_fru_close_device_id ipmi_fru_parse_close_device_id
#define ipmi_fru_ctx_errormsg ipmi_fru_parse_ctx_errormsg
#define ipmi_fru_read_data_area ipmi_fru_parse_read_data_area
#define ipmi_fru_next ipmi_fru_parse_next
#define ipmi_fru_type_length_field_to_string ipmi_fru_parse_type_length_field_to_string
#define ipmi_fru_multirecord_power_supply_information ipmi_fru_parse_multirecord_power_supply_information
#define ipmi_fru_board_info_area ipmi_fru_parse_board_info_area
#define ipmi_fru_field_t ipmi_fru_parse_field_t
# define ipmi_sdr_ctx_create ipmi_sdr_cache_ctx_create
# define ipmi_sdr_ctx_destroy ipmi_sdr_cache_ctx_destroy
# define ipmi_sdr_ctx_errnum ipmi_sdr_cache_ctx_errnum
# define ipmi_sdr_ctx_errormsg ipmi_sdr_cache_ctx_errormsg
# define ipmi_fru_ctx_create ipmi_fru_parse_ctx_create
# define ipmi_fru_ctx_destroy ipmi_fru_parse_ctx_destroy
# define ipmi_fru_ctx_set_flags ipmi_fru_parse_ctx_set_flags
# define ipmi_fru_ctx_strerror ipmi_fru_parse_ctx_strerror
# define ipmi_fru_ctx_errnum ipmi_fru_parse_ctx_errnum
# define ipmi_fru_open_device_id ipmi_fru_parse_open_device_id
# define ipmi_fru_close_device_id ipmi_fru_parse_close_device_id
# define ipmi_fru_ctx_errormsg ipmi_fru_parse_ctx_errormsg
# define ipmi_fru_read_data_area ipmi_fru_parse_read_data_area
# define ipmi_fru_next ipmi_fru_parse_next
# define ipmi_fru_type_length_field_to_string ipmi_fru_parse_type_length_field_to_string
# define ipmi_fru_multirecord_power_supply_information ipmi_fru_parse_multirecord_power_supply_information
# define ipmi_fru_board_info_area ipmi_fru_parse_board_info_area
# define ipmi_fru_field_t ipmi_fru_parse_field_t
/* Constants */
#define IPMI_SDR_MAX_RECORD_LENGTH IPMI_SDR_CACHE_MAX_SDR_RECORD_LENGTH
#define IPMI_SDR_ERR_CACHE_READ_CACHE_DOES_NOT_EXIST IPMI_SDR_CACHE_ERR_CACHE_READ_CACHE_DOES_NOT_EXIST
#define IPMI_FRU_AREA_SIZE_MAX IPMI_FRU_PARSE_AREA_SIZE_MAX
#define IPMI_FRU_FLAGS_SKIP_CHECKSUM_CHECKS IPMI_FRU_PARSE_FLAGS_SKIP_CHECKSUM_CHECKS
#define IPMI_FRU_AREA_TYPE_BOARD_INFO_AREA IPMI_FRU_PARSE_AREA_TYPE_BOARD_INFO_AREA
#define IPMI_FRU_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION IPMI_FRU_PARSE_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION
#define IPMI_FRU_AREA_STRING_MAX IPMI_FRU_PARSE_AREA_STRING_MAX
#define NUT_IPMI_SDR_CACHE_DEFAULTS IPMI_SDR_CACHE_CREATE_FLAGS_DEFAULT, IPMI_SDR_CACHE_VALIDATION_FLAGS_DEFAULT
# define IPMI_SDR_MAX_RECORD_LENGTH IPMI_SDR_CACHE_MAX_SDR_RECORD_LENGTH
# define IPMI_SDR_ERR_CACHE_READ_CACHE_DOES_NOT_EXIST IPMI_SDR_CACHE_ERR_CACHE_READ_CACHE_DOES_NOT_EXIST
# define IPMI_FRU_AREA_SIZE_MAX IPMI_FRU_PARSE_AREA_SIZE_MAX
# define IPMI_FRU_FLAGS_SKIP_CHECKSUM_CHECKS IPMI_FRU_PARSE_FLAGS_SKIP_CHECKSUM_CHECKS
# define IPMI_FRU_AREA_TYPE_BOARD_INFO_AREA IPMI_FRU_PARSE_AREA_TYPE_BOARD_INFO_AREA
# define IPMI_FRU_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION IPMI_FRU_PARSE_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION
# define IPMI_FRU_AREA_STRING_MAX IPMI_FRU_PARSE_AREA_STRING_MAX
# define NUT_IPMI_SDR_CACHE_DEFAULTS IPMI_SDR_CACHE_CREATE_FLAGS_DEFAULT, IPMI_SDR_CACHE_VALIDATION_FLAGS_DEFAULT
#endif /* HAVE_FREEIPMI_11X_12X */

/* FIXME: freeipmi auto selects a cache based on the hostname you are
Expand Down Expand Up @@ -310,22 +310,23 @@ static const char* libfreeipmi_getfield (uint8_t language_code,
if (strbuflen)
return strbuf;

return NULL;
return NULL;
}

/* Get voltage value from the IPMI voltage code */
static float libfreeipmi_get_voltage (uint8_t voltage_code)
{
if (voltage_code == IPMI_FRU_VOLTAGE_12V)
return 12;
else if (voltage_code == IPMI_FRU_VOLTAGE_MINUS12V)
return -12;
else if (voltage_code == IPMI_FRU_VOLTAGE_5V)
return 5;
else if (voltage_code == IPMI_FRU_VOLTAGE_3_3V)
return 3.3;
else
return 0;
/* FIXME: switch/case? */
if (voltage_code == IPMI_FRU_VOLTAGE_12V)
return 12;
else if (voltage_code == IPMI_FRU_VOLTAGE_MINUS12V)
return -12;
else if (voltage_code == IPMI_FRU_VOLTAGE_5V)
return 5;
else if (voltage_code == IPMI_FRU_VOLTAGE_3_3V)
return 3.3;
else
return 0;
}

/* Cleanup IPMI contexts */
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ static int match_function_exact(USBDevice_t *hd, void *privdata)
}
#endif
#if (defined WITH_USB_BUSPORT) && (WITH_USB_BUSPORT)
#ifdef DEBUG_EXACT_MATCH_BUSPORT
# ifdef DEBUG_EXACT_MATCH_BUSPORT
if (strcmp_null(hd->BusPort, data->BusPort) != 0) {
upsdebugx(2, "%s: failed match of %s: %s != %s",
__func__, "BusPort", hd->BusPort, data->BusPort);
return 0;
}
#endif
# endif
#endif
#ifdef DEBUG_EXACT_MATCH_DEVICE
if (strcmp_null(hd->Device, data->Device) != 0) {
Expand Down
Loading

0 comments on commit c91684f

Please sign in to comment.