Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37044990
en ru br
ALT Linux repos
S:1.2.1-alt1
5.0: 1.1.35-alt1.1
4.1: 1.1.35-alt1
4.0: 1.1.31-alt1.1
3.0: 1.1.31-alt1

Group :: Communications
RPM: mgetty

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Patch: mgetty-1.1.30-unioninit.new.patch
Download


diff --git a/mgetty/callback/conf_cb.c b/mgetty/callback/conf_cb.c
index 615f3f9..bb85146 100644
--- a/mgetty/callback/conf_cb.c
+++ b/mgetty/callback/conf_cb.c
@@ -31,7 +31,7 @@ static char * def_init_chat_seq[] = { "",
  */
 
 struct conf_data_mgetty c = {
-	{ "dialout-devices", {(p_int)FAX_MODEM_TTYS}, CT_STRING, C_PRESET },
+	{ "dialout-devices", {p:FAX_MODEM_TTYS}, CT_STRING, C_PRESET },
 	{ "dialout-devices", {0}, CT_STRING, C_IGNORE },
 	{ "delay", {20}, CT_INT, C_PRESET },
 	{ "delay-randomize", {10}, CT_INT, C_PRESET },
@@ -40,7 +40,7 @@ struct conf_data_mgetty c = {
 
 	{ "modem-init", {0}, CT_CHAT, C_PRESET },
 	{ "speed", {DEFAULT_PORTSPEED}, CT_INT, C_PRESET },
-	{ "dial-prefix", {(p_int) FAX_DIAL_PREFIX}, CT_STRING, C_PRESET },
+	{ "dial-prefix", {p: FAX_DIAL_PREFIX}, CT_STRING, C_PRESET },
 	{ "autobauding", {FALSE}, CT_BOOL, C_PRESET },
 	{ "prompt-waittime", {300}, CT_INT, C_PRESET },
 
diff --git a/mgetty/conf_mg.c b/mgetty/conf_mg.c
index ea96cfe..2ddebef 100644
--- a/mgetty/conf_mg.c
+++ b/mgetty/conf_mg.c
@@ -73,9 +73,9 @@ struct conf_data_mgetty c = {
 	{ "direct", {FALSE}, CT_BOOL, C_PRESET },
 	{ "blocking", {FALSE}, CT_BOOL, C_PRESET },
 
-	{ "port-owner", {(p_int) DEVICE_OWNER}, CT_STRING, C_PRESET },
+	{ "port-owner", {p: DEVICE_OWNER}, CT_STRING, C_PRESET },
 #ifdef DEVICE_GROUP
-	{ "port-group", {(p_int) DEVICE_GROUP}, CT_STRING, C_PRESET },
+	{ "port-group", {p: DEVICE_GROUP}, CT_STRING, C_PRESET },
 #else
 	{ "port-group", {0}, CT_STRING, C_EMPTY },
 #endif
@@ -87,7 +87,7 @@ struct conf_data_mgetty c = {
 	{ "need-dsr", {FALSE}, CT_BOOL, C_PRESET },
 	{ "data-only", {FALSE}, CT_BOOL, C_PRESET },
 	{ "fax-only", {FALSE}, CT_BOOL, C_PRESET },
-	{ "modem-type", {(p_int) DEFAULT_MODEMTYPE}, CT_STRING, C_PRESET },
+	{ "modem-type", {p: DEFAULT_MODEMTYPE}, CT_STRING, C_PRESET },
 	{ "modem-quirks", {0}, CT_INT, C_EMPTY },
 	{ "init-chat", {0}, CT_CHAT, C_EMPTY },
 	{ "force-init-chat", {0}, CT_CHAT, C_EMPTY },
@@ -98,12 +98,12 @@ struct conf_data_mgetty c = {
 
 	{ "modem-check-time", {MODEM_CHECK_TIME}, CT_INT, C_PRESET },
 	{ "rings", {1}, CT_INT, C_PRESET },
-	{ "msn-list", {(p_int) NULL}, CT_CHAT, C_EMPTY },
+	{ "msn-list", {p: NULL}, CT_CHAT, C_EMPTY },
 	{ "get-cnd-chat", {0}, CT_CHAT, C_EMPTY },
 	{ "cid-program", {(p_int) NULL}, CT_STRING, C_EMPTY },
 	{ "deny-chat", {0}, CT_CHAT, C_EMPTY },
-	{ "cnd-program", {(p_int) NULL}, CT_STRING, C_EMPTY },
-	{ "answer-time", {(p_int) NULL}, CT_STRING, C_EMPTY },
+	{ "cnd-program", {p: NULL}, CT_STRING, C_EMPTY },
+	{ "answer-time", {p: NULL}, CT_STRING, C_EMPTY },
 	{ "answer-chat", {0}, CT_CHAT, C_EMPTY },
 	{ "answer-chat-timeout", {80}, CT_INT, C_PRESET },
 	{ "autobauding", {FALSE}, CT_BOOL, C_PRESET },
@@ -112,9 +112,9 @@ struct conf_data_mgetty c = {
 	{ "ringback-time", {30}, CT_INT, C_PRESET },
 
 	{ "ignore-carrier", {FALSE}, CT_BOOL, C_PRESET },
-	{ "issue-file", {(p_int)"/etc/issue"}, CT_STRING, C_PRESET },
+	{ "issue-file", {p:"/etc/issue"}, CT_STRING, C_PRESET },
 	{ "prompt-waittime", {500}, CT_INT, C_PRESET },
-	{ "login-prompt", {(p_int) LOGIN_PROMPT}, CT_STRING, C_PRESET },
+	{ "login-prompt", {p: LOGIN_PROMPT}, CT_STRING, C_PRESET },
 #ifdef MAX_LOGIN_TIME
 	{ "login-time", {MAX_LOGIN_TIME}, CT_INT, C_PRESET },
 #else
@@ -124,39 +124,39 @@ struct conf_data_mgetty c = {
 	{ "login-env-ttyprompt-hack", {FALSE}, CT_BOOL, C_PRESET },
 
 #ifdef LOGIN_CFG_FILE
-	{ "login-conf-file", {(p_int) LOGIN_CFG_FILE}, CT_STRING, C_PRESET },
+	{ "login-conf-file", {p: LOGIN_CFG_FILE}, CT_STRING, C_PRESET },
 #else
 	{ "login-conf-file", {0}, CT_STRING, C_EMPTY },
 #endif
 
-	{ "fax-id", {(p_int)FAX_STATION_ID}, CT_STRING, C_PRESET },
+	{ "fax-id", {p:FAX_STATION_ID}, CT_STRING, C_PRESET },
 	{ "fax-min-speed", {0}, CT_INT, C_PRESET },
 	{ "fax-max-speed", {14400}, CT_INT, C_PRESET },
 	{ "fax-server-file", {0}, CT_STRING, C_EMPTY },
 	{ "diskspace", {MINFREESPACE}, CT_INT, C_PRESET },
 #ifdef MAIL_TO
-	{ "notify", {(p_int)MAIL_TO}, CT_STRING, C_PRESET },
+	{ "notify", {p:MAIL_TO}, CT_STRING, C_PRESET },
 #else
 	{ "notify", {0}, CT_STRING, C_EMPTY },
 #endif
-	{ "fax-owner", {(p_int)FAX_IN_OWNER}, CT_STRING, C_PRESET },
+	{ "fax-owner", {p:FAX_IN_OWNER}, CT_STRING, C_PRESET },
 #ifdef FAX_IN_GROUP
-	{ "fax-group", {(p_int)FAX_IN_GROUP}, CT_STRING, C_PRESET },
+	{ "fax-group", {p:FAX_IN_GROUP}, CT_STRING, C_PRESET },
 #else
 	{ "fax-group", {0}, CT_STRING, C_EMPTY },
 #endif
 	{ "fax-mode", {FAX_FILE_MODE}, CT_INT, C_PRESET },
 #ifdef __STDC__
-	{ "fax-spool-in", {(p_int) FAX_SPOOL_IN ":/tmp"}, CT_STRING, C_PRESET },
+	{ "fax-spool-in", {p: FAX_SPOOL_IN ":/tmp"}, CT_STRING, C_PRESET },
 #else
-	{ "fax-spool-in", {(p_int) FAX_SPOOL_IN}, CT_STRING, C_PRESET },
+	{ "fax-spool-in", {p: FAX_SPOOL_IN}, CT_STRING, C_PRESET },
 #endif
 
 	{ "debug", {LOG_LEVEL}, CT_INT, C_PRESET },
 	
 	{ "statistics-chat", {0}, CT_CHAT, C_EMPTY },
 	{ "statistics-file", {0}, CT_STRING, C_EMPTY },
-	{ "gettydefs", {(p_int)GETTYDEFS_DEFAULT_TAG}, CT_STRING, C_PRESET },
+	{ "gettydefs", {p:GETTYDEFS_DEFAULT_TAG}, CT_STRING, C_PRESET },
 	{ "term", {0}, CT_STRING, C_EMPTY },
 #ifdef SMS
 	{ "sms-handler", {0}, CT_STRING, C_EMPTY },
diff --git a/mgetty/conf_sf.c b/mgetty/conf_sf.c
index 6e2b032..b21d67f 100644
--- a/mgetty/conf_sf.c
+++ b/mgetty/conf_sf.c
@@ -37,11 +37,11 @@ struct conf_data_sendfax c = {
 	{ "fax-devices", {0}, CT_STRING, C_IGNORE },
 	{ "modem-init", {0}, CT_STRING, C_EMPTY },
 #ifdef FAX_MODEM_HANDSHAKE
-	{ "modem-handshake", {(p_int) FAX_MODEM_HANDSHAKE}, CT_STRING, C_PRESET },
+	{ "modem-handshake", {p: FAX_MODEM_HANDSHAKE}, CT_STRING, C_PRESET },
 #else
 	{ "modem-handshake", {0}, CT_STRING, C_EMPTY },
 #endif
-	{ "modem-type", {(p_int) DEFAULT_MODEMTYPE}, CT_STRING, C_PRESET },
+	{ "modem-type", {p: DEFAULT_MODEMTYPE}, CT_STRING, C_PRESET },
 	{ "modem-quirks", {0}, CT_INT, C_EMPTY },
 	{ "reset-after-fail", {0}, CT_STRING, C_EMPTY },
 	{ "fax-send-flow", {FAXSEND_FLOW}, CT_FLOWL, C_PRESET },
@@ -52,9 +52,9 @@ struct conf_data_sendfax c = {
 	{ "switchbd", {FAX_SEND_SWITCHBD}, CT_INT, C_PRESET },
 	{ "open-delay",	{0}, CT_INT, C_EMPTY },
 	{ "ignore-carrier", {TRUE }, CT_BOOL, C_PRESET },
-	{ "dial-prefix", {(p_int) FAX_DIAL_PREFIX}, CT_STRING, C_PRESET },
-	{ "fax-id", {(p_int)FAX_STATION_ID}, CT_STRING, C_PRESET },
-	{ "poll-dir", {(p_int)"."}, CT_STRING, C_PRESET },
+	{ "dial-prefix", {p: FAX_DIAL_PREFIX}, CT_STRING, C_PRESET },
+	{ "fax-id", {p:FAX_STATION_ID}, CT_STRING, C_PRESET },
+	{ "poll-dir", {p:"."}, CT_STRING, C_PRESET },
 	{ "normal-res", {0}, CT_BOOL, C_PRESET },
 	{ "fax-min-speed", {0}, CT_INT, C_PRESET },
 	{ "fax-max-speed", {14400}, CT_INT, C_PRESET },
@@ -64,7 +64,7 @@ struct conf_data_sendfax c = {
 	{ "page-header", {0}, CT_STRING, C_EMPTY },
 	{ "" /* stdin */, {FALSE}, CT_BOOL, C_PRESET },
 	{ "" /* rename */, {FALSE}, CT_BOOL, C_PRESET },
-	{ "" /* acct_handle */, {(p_int)""}, CT_STRING, C_PRESET },
+	{ "" /* acct_handle */, {p:""}, CT_STRING, C_PRESET },
 	{ NULL, {0}, CT_STRING, C_EMPTY }};
 
 int sendfax_parse_args _P2( (argc,argv), int argc, char ** argv )
diff --git a/mgetty/voice/include/config.h b/mgetty/voice/include/config.h
index baff21f..58efa59 100644
--- a/mgetty/voice/include/config.h
+++ b/mgetty/voice/include/config.h
@@ -30,7 +30,7 @@ struct conf_voice_data cvd =
            
 #else
 
-#define STRING (p_int)
+#define STRING p:
 #define KEYWORD(name) \
  struct conf_data name;
 #define CONF(field_name, default_value, value_type) \
@@ -55,7 +55,7 @@ extern struct conf_voice_data
 
 #ifdef CONFIG_C
 
-     {NULL, {(p_int) ""}, CT_STRING, C_EMPTY}
+     {NULL, {p: ""}, CT_STRING, C_EMPTY}
      };
 
 #else
 
design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
current maintainer: Michael Shigorin