DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2026-01-20 21:00:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix -Wshadow warnings

Browse Source 
Rename variables to avoid conflicts in naming of local and global
variables.
This commit is contained in:
Miroslav Lichvar
2025-11-19 16:05:38 +01:00
parent 0fec9e5cfa
commit 42e7a7ae12
8 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
rtc_linux.c
View File

@@ -51,7 +51,7 @@
static void measurement_timeout(void *any);
static void read_from_device(int fd_, int event, void *any);
static void read_from_device(int fd, int event, void *any);
/* ================================================== */
@@ -65,7 +65,7 @@ static OperatingMode operating_mode = OM_NORMAL;
/* ================================================== */
static int fd;
static int rtc_fd;
#define LOWEST_MEASUREMENT_PERIOD 15
#define HIGHEST_MEASUREMENT_PERIOD 480
@@ -522,21 +522,21 @@ int
RTC_Linux_Initialise(void)
{
/* Try to open the device */
fd = open(CNF_GetRtcDevice(), O_RDWR);
if (fd < 0) {
rtc_fd = open(CNF_GetRtcDevice(), O_RDWR);
if (rtc_fd < 0) {
LOG(LOGS_ERR, "Could not open RTC device %s : %s",
CNF_GetRtcDevice(), strerror(errno));
return 0;
}
/* Make sure the RTC supports interrupts */
if (!RTC_Linux_SwitchInterrupt(fd, 1) || !RTC_Linux_SwitchInterrupt(fd, 0)) {
close(fd);
if (!RTC_Linux_SwitchInterrupt(rtc_fd, 1) || !RTC_Linux_SwitchInterrupt(rtc_fd, 0)) {
close(rtc_fd);
return 0;
}
/* Close on exec */
UTI_FdSetCloexec(fd);
UTI_FdSetCloexec(rtc_fd);
rtc_sec = MallocArray(time_t, MAX_SAMPLES);
system_times = MallocArray(struct timespec, MAX_SAMPLES);
@@ -557,7 +557,7 @@ RTC_Linux_Initialise(void)
operating_mode = OM_NORMAL;
/* Register file handler */
SCH_AddFileHandler(fd, SCH_FILE_INPUT, read_from_device, NULL);
SCH_AddFileHandler(rtc_fd, SCH_FILE_INPUT, read_from_device, NULL);
/* Register slew handler */
LCL_AddParameterChangeHandler(slew_samples, NULL);
@@ -577,10 +577,10 @@ RTC_Linux_Finalise(void)
timeout_id = 0;
/* Remove input file handler */
if (fd >= 0) {
SCH_RemoveFileHandler(fd);
RTC_Linux_SwitchInterrupt(fd, 0);
close(fd);
if (rtc_fd >= 0) {
SCH_RemoveFileHandler(rtc_fd);
RTC_Linux_SwitchInterrupt(rtc_fd, 0);
close(rtc_fd);
/* Save the RTC data */
(void) RTC_Linux_WriteParameters();
@@ -600,7 +600,7 @@ static void
measurement_timeout(void *any)
{
timeout_id = 0;
RTC_Linux_SwitchInterrupt(fd, 1);
RTC_Linux_SwitchInterrupt(rtc_fd, 1);
}
/* ================================================== */
@@ -613,7 +613,7 @@ set_rtc(time_t new_rtc_time)
rtc_from_t(&new_rtc_time, &rtc_raw, rtc_on_utc);
status = ioctl(fd, RTC_SET_TIME, &rtc_raw);
status = ioctl(rtc_fd, RTC_SET_TIME, &rtc_raw);
if (status < 0) {
LOG(LOGS_ERR, "Could not set RTC time");
}
@@ -810,25 +810,26 @@ RTC_Linux_ReadTimeAfterInterrupt(int fd, int utc,
}
static void
read_from_device(int fd_, int event, void *any)
read_from_device(int fd, int event, void *any)
{
struct timespec sys_time;
int status, error = 0;
time_t rtc_t;
status = RTC_Linux_CheckInterrupt(fd);
status = RTC_Linux_CheckInterrupt(rtc_fd);
if (status < 0) {
SCH_RemoveFileHandler(fd);
RTC_Linux_SwitchInterrupt(fd, 0); /* Likely to raise error too, but just to be sure... */
close(fd);
fd = -1;
SCH_RemoveFileHandler(rtc_fd);
/* Likely to raise error too, but just to be sure... */
RTC_Linux_SwitchInterrupt(rtc_fd, 0);
close(rtc_fd);
rtc_fd = -1;
return;
} else if (status == 0) {
/* Wait for the next interrupt, this one may be bogus */
return;
}
rtc_t = RTC_Linux_ReadTimeAfterInterrupt(fd, rtc_on_utc, &sys_time, NULL);
rtc_t = RTC_Linux_ReadTimeAfterInterrupt(rtc_fd, rtc_on_utc, &sys_time, NULL);
if (rtc_t == (time_t)-1) {
error = 1;
goto turn_off_interrupt;
@@ -857,7 +858,7 @@ turn_off_interrupt:
operating_mode = OM_NORMAL;
(after_init_hook)(after_init_hook_arg);
RTC_Linux_SwitchInterrupt(fd, 0);
RTC_Linux_SwitchInterrupt(rtc_fd, 0);
timeout_id = SCH_AddTimeoutByDelay((double) measurement_period, measurement_timeout, NULL);
}
@@ -869,7 +870,7 @@ turn_off_interrupt:
DEBUG_LOG("Could not complete after trim relock due to errors");
operating_mode = OM_NORMAL;
RTC_Linux_SwitchInterrupt(fd, 0);
RTC_Linux_SwitchInterrupt(rtc_fd, 0);
timeout_id = SCH_AddTimeoutByDelay((double) measurement_period, measurement_timeout, NULL);
}
@@ -877,7 +878,7 @@ turn_off_interrupt:
break;
case OM_NORMAL:
RTC_Linux_SwitchInterrupt(fd, 0);
RTC_Linux_SwitchInterrupt(rtc_fd, 0);
timeout_id = SCH_AddTimeoutByDelay((double) measurement_period, measurement_timeout, NULL);
@@ -899,7 +900,7 @@ RTC_Linux_TimeInit(void (*after_hook)(void *), void *anything)
operating_mode = OM_INITIAL;
timeout_id = 0;
RTC_Linux_SwitchInterrupt(fd, 1);
RTC_Linux_SwitchInterrupt(rtc_fd, 1);
}
/* ================================================== */
@@ -917,7 +918,7 @@ RTC_Linux_WriteParameters(void)
{
int retval;
if (fd < 0) {
if (rtc_fd < 0) {
return RTC_ST_NODRV;
}
@@ -1086,7 +1087,7 @@ RTC_Linux_Trim(void)
/* And start rapid sampling, interrupts on now */
SCH_RemoveTimeout(timeout_id);
timeout_id = 0;
RTC_Linux_SwitchInterrupt(fd, 1);
RTC_Linux_SwitchInterrupt(rtc_fd, 1);
}
return 1;