• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscapheguic翻訳omegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

Commit MetaInfo

Revision4f47892a001aed6cd2f0d730d679a8a82d4ad2fb (tree)
Time2020-10-14 18:33:58
AuthorSASANO Takayoshi <uaa@uaa....>
CommiterSASANO Takayoshi

Log Message

rename variable name sigset -> set_sig

using same variable name as well-known funcion sometimes make conflicts.
see man of sigset(3), it is System V API but still alive.

Change Summary

Incremental Difference

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -74,7 +74,7 @@ void rig_fifo_check (void);
7474 int sig_term;
7575
7676 sigset_t save_sig;
77-sigset_t sigset;
77+sigset_t set_sig;
7878
7979 fd_set read_set;
8080 fd_set fd_save;
--- a/main.c
+++ b/main.c
@@ -338,9 +338,9 @@ top:
338338
339339
340340 memcpy (&read_set, &fd_save, sizeof(fd_set));
341- memcpy (&sigset, &save_sig, sizeof(save_sig));
341+ memcpy (&set_sig, &save_sig, sizeof(save_sig));
342342 ret = pselect (FD_SETSIZE, &read_set, (fd_set *)NULL,
343- (fd_set *)NULL, &timeout, &sigset);
343+ (fd_set *)NULL, &timeout, &set_sig);
344344 if (ret < 0)
345345 {
346346 if ((errno == EAGAIN) || (errno == EINTR)) goto skip;
@@ -556,9 +556,9 @@ void wait_disconnect (void)
556556 while (1)
557557 {
558558 memcpy (&read_set, &fd_save, sizeof(fd_set));
559- memcpy (&sigset, &save_sig, sizeof(save_sig));
559+ memcpy (&set_sig, &save_sig, sizeof(save_sig));
560560 ret = pselect (FD_SETSIZE, &read_set, (fd_set *)NULL,
561- (fd_set *)NULL, &timeout, &sigset);
561+ (fd_set *)NULL, &timeout, &set_sig);
562562 if (ret > 0)
563563 {
564564 if (FD_ISSET (in_addr_sock, &read_set))
--- a/rpt_conn.c
+++ b/rpt_conn.c
@@ -131,9 +131,9 @@ scan_loop:
131131 lcd_time_save = cur_time;
132132 }
133133 memcpy (&read_set, &fd_save, sizeof(fd_set));
134- memcpy (&sigset, &save_sig, sizeof(save_sig));
134+ memcpy (&set_sig, &save_sig, sizeof(save_sig));
135135 ret = pselect (FD_SETSIZE, &read_set, (fd_set *)NULL,
136- (fd_set *)NULL, &timeout, &sigset);
136+ (fd_set *)NULL, &timeout, &set_sig);
137137 if (ret < 0)
138138 {
139139 if ((errno == EAGAIN) || (errno == EINTR)) goto skip;
--- a/rpt_conn.h
+++ b/rpt_conn.h
@@ -55,7 +55,7 @@ int sig_term;
5555 char connect_call[8];
5656
5757 sigset_t save_sig;
58-sigset_t sigset;
58+sigset_t set_sig;
5959
6060 fd_set read_set;
6161 fd_set fd_save;