aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/epan
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/epan')
-rw-r--r--plugins/epan/ethercat/packet-ams.c2
-rw-r--r--plugins/epan/ethercat/packet-ecatmb.c50
-rw-r--r--plugins/epan/ethercat/packet-ethercat-datagram.c22
-rw-r--r--plugins/epan/ethercat/packet-ioraw.c2
-rw-r--r--plugins/epan/ethercat/packet-nv.c6
-rw-r--r--plugins/epan/irda/packet-irda.c6
-rw-r--r--plugins/epan/mate/mate_grammar.lemon2
-rw-r--r--plugins/epan/mate/mate_setup.c2
-rw-r--r--plugins/epan/mate/mate_util.c6
-rw-r--r--plugins/epan/opcua/opcua_simpletypes.c2
-rw-r--r--plugins/epan/profinet/packet-pn-ptcp.c6
-rw-r--r--plugins/epan/profinet/packet-pn-rt.c6
-rw-r--r--plugins/epan/stats_tree/pinfo_stats_tree.c2
13 files changed, 57 insertions, 57 deletions
diff --git a/plugins/epan/ethercat/packet-ams.c b/plugins/epan/ethercat/packet-ams.c
index 2c9a7f7b9f..46a598d0b4 100644
--- a/plugins/epan/ethercat/packet-ams.c
+++ b/plugins/epan/ethercat/packet-ams.c
@@ -372,7 +372,7 @@ static const value_string AMS_CommandId_vals[] =
static void NetIdFormater(tvbuff_t *tvb, guint offset, char *szText, gint nMax)
{
- g_snprintf ( szText, nMax, "%d.%d.%d.%d.%d.%d", tvb_get_guint8(tvb, offset),
+ snprintf ( szText, nMax, "%d.%d.%d.%d.%d.%d", tvb_get_guint8(tvb, offset),
tvb_get_guint8(tvb, offset+1),
tvb_get_guint8(tvb, offset+2),
tvb_get_guint8(tvb, offset+3),
diff --git a/plugins/epan/ethercat/packet-ecatmb.c b/plugins/epan/ethercat/packet-ecatmb.c
index 8192d3e523..05c6380868 100644
--- a/plugins/epan/ethercat/packet-ecatmb.c
+++ b/plugins/epan/ethercat/packet-ecatmb.c
@@ -338,22 +338,22 @@ static void CANopenSdoReqFormatter(PETHERCAT_SDO_HEADER pSdo, char *szText, gint
switch ( pSdo->anSdoHeaderUnion.Idq.Ccs )
{
case SDO_CCS_INITIATE_DOWNLOAD:
- g_snprintf ( szText, nMax, "SDO Req : 'Initiate Download' (%d) Idx=0x%x Sub=%d", pSdo->anSdoHeaderUnion.Idq.Ccs, pSdo->Index, pSdo->SubIndex);
+ snprintf ( szText, nMax, "SDO Req : 'Initiate Download' (%d) Idx=0x%x Sub=%d", pSdo->anSdoHeaderUnion.Idq.Ccs, pSdo->Index, pSdo->SubIndex);
break;
case SDO_CCS_INITIATE_UPLOAD:
- g_snprintf ( szText, nMax, "SDO Req : 'Initiate Upload' (%d) Idx=0x%x Sub=%d", pSdo->anSdoHeaderUnion.Idq.Ccs, pSdo->Index, pSdo->SubIndex);
+ snprintf ( szText, nMax, "SDO Req : 'Initiate Upload' (%d) Idx=0x%x Sub=%d", pSdo->anSdoHeaderUnion.Idq.Ccs, pSdo->Index, pSdo->SubIndex);
break;
case SDO_CCS_DOWNLOAD_SEGMENT:
- g_snprintf ( szText, nMax, "SDO Req : 'Download Segment' (%d)", pSdo->anSdoHeaderUnion.Idq.Ccs);
+ snprintf ( szText, nMax, "SDO Req : 'Download Segment' (%d)", pSdo->anSdoHeaderUnion.Idq.Ccs);
break;
case SDO_CCS_UPLOAD_SEGMENT:
- g_snprintf ( szText, nMax, "SDO Req : 'Upload Segment' (%d)", pSdo->anSdoHeaderUnion.Idq.Ccs);
+ snprintf ( szText, nMax, "SDO Req : 'Upload Segment' (%d)", pSdo->anSdoHeaderUnion.Idq.Ccs);
break;
case SDO_CCS_ABORT_TRANSFER:
- g_snprintf ( szText, nMax, "SDO Req : 'Abort Transfer' (%d)", pSdo->anSdoHeaderUnion.Idq.Ccs);
+ snprintf ( szText, nMax, "SDO Req : 'Abort Transfer' (%d)", pSdo->anSdoHeaderUnion.Idq.Ccs);
break;
default:
- g_snprintf ( szText, nMax, "SDO Req : Ccs %d", pSdo->anSdoHeaderUnion.Idq.Ccs);
+ snprintf ( szText, nMax, "SDO Req : Ccs %d", pSdo->anSdoHeaderUnion.Idq.Ccs);
}
}
@@ -378,37 +378,37 @@ static void FoeFormatter(tvbuff_t *tvb, gint offset, char *szText, gint nMax, gu
switch ( foe.OpMode )
{
case ECAT_FOE_OPMODE_RRQ:
- g_snprintf ( szText, nMax, "FoE RRQ (%d) : '%s'", foe.aFoeHeaderDataUnion.FileLength, tmp);
+ snprintf ( szText, nMax, "FoE RRQ (%d) : '%s'", foe.aFoeHeaderDataUnion.FileLength, tmp);
break;
case ECAT_FOE_OPMODE_WRQ:
- g_snprintf ( szText, nMax, "FoE WRQ (%d) : '%s'", foe.aFoeHeaderDataUnion.FileLength, tmp);
+ snprintf ( szText, nMax, "FoE WRQ (%d) : '%s'", foe.aFoeHeaderDataUnion.FileLength, tmp);
break;
case ECAT_FOE_OPMODE_DATA:
- g_snprintf ( szText, nMax, "FoE DATA (%d) : %d Bytes", foe.aFoeHeaderDataUnion.v.PacketNo, foe_length-ETHERCAT_FOE_HEADER_LEN);
+ snprintf ( szText, nMax, "FoE DATA (%d) : %d Bytes", foe.aFoeHeaderDataUnion.v.PacketNo, foe_length-ETHERCAT_FOE_HEADER_LEN);
break;
case ECAT_FOE_OPMODE_ACK:
- g_snprintf ( szText, nMax, "FoE ACK (%d)", foe.aFoeHeaderDataUnion.v.PacketNo);
+ snprintf ( szText, nMax, "FoE ACK (%d)", foe.aFoeHeaderDataUnion.v.PacketNo);
break;
case ECAT_FOE_OPMODE_ERR:
- g_snprintf ( szText, nMax, "FoE ERR (%d) : '%s'", foe.aFoeHeaderDataUnion.ErrorCode, tmp);
+ snprintf ( szText, nMax, "FoE ERR (%d) : '%s'", foe.aFoeHeaderDataUnion.ErrorCode, tmp);
break;
case ECAT_FOE_OPMODE_BUSY:
if ( foe.aFoeHeaderDataUnion.v2.Entire > 0 )
- g_snprintf ( szText, nMax, "FoE BUSY (%d%%)", ((guint32)foe.aFoeHeaderDataUnion.v2.Done*100)/foe.aFoeHeaderDataUnion.v2.Entire);
+ snprintf ( szText, nMax, "FoE BUSY (%d%%)", ((guint32)foe.aFoeHeaderDataUnion.v2.Done*100)/foe.aFoeHeaderDataUnion.v2.Entire);
else
- g_snprintf ( szText, nMax, "FoE BUSY (%d/%d)", foe.aFoeHeaderDataUnion.v2.Done, foe.aFoeHeaderDataUnion.v2.Entire);
+ snprintf ( szText, nMax, "FoE BUSY (%d/%d)", foe.aFoeHeaderDataUnion.v2.Done, foe.aFoeHeaderDataUnion.v2.Entire);
break;
default:
- g_snprintf ( szText, nMax, "FoE Unknown");
+ snprintf ( szText, nMax, "FoE Unknown");
}
}
static void SoEIdToString( char* txt, guint16 id, int nMax)
{
if ( id & 0x8000 )
- g_snprintf(txt, nMax, "P-%d-%04d", (id>>12) & 0x0007, id & 0x0FFF );
+ snprintf(txt, nMax, "P-%d-%04d", (id>>12) & 0x0007, id & 0x0FFF );
else
- g_snprintf(txt, nMax, "S-%d-%04d", id>>12, id & 0x0FFF );
+ snprintf(txt, nMax, "S-%d-%04d", id>>12, id & 0x0FFF );
}
static void SoeFormatter(tvbuff_t *tvb, gint offset, char *szText, gint nMax, guint soe_length)
@@ -444,32 +444,32 @@ static void SoeFormatter(tvbuff_t *tvb, gint offset, char *szText, gint nMax, gu
switch ( soe.anSoeHeaderControlUnion.v.OpCode )
{
case ECAT_SOE_OPCODE_RRQ:
- g_snprintf ( szText, nMax, "SoE: RRQ (%s, '%s')", tmp, elm);
+ snprintf ( szText, nMax, "SoE: RRQ (%s, '%s')", tmp, elm);
break;
case ECAT_SOE_OPCODE_RRS:
- g_snprintf ( szText, nMax, "SoE: RRS (%s, '%s') : %u Bytes", tmp, elm, (guint)(soe_length-ETHERCAT_SOE_HEADER_LEN));
+ snprintf ( szText, nMax, "SoE: RRS (%s, '%s') : %u Bytes", tmp, elm, (guint)(soe_length-ETHERCAT_SOE_HEADER_LEN));
break;
case ECAT_SOE_OPCODE_WRS:
- g_snprintf ( szText, nMax, "SoE: WRS (%s, '%s')", tmp, elm);
+ snprintf ( szText, nMax, "SoE: WRS (%s, '%s')", tmp, elm);
break;
case ECAT_SOE_OPCODE_WRQ:
- g_snprintf ( szText, nMax, "SoE: WRQ (%s, '%s') : %u Bytes", tmp, elm, (guint)(soe_length-ETHERCAT_SOE_HEADER_LEN));
+ snprintf ( szText, nMax, "SoE: WRQ (%s, '%s') : %u Bytes", tmp, elm, (guint)(soe_length-ETHERCAT_SOE_HEADER_LEN));
break;
case ECAT_SOE_OPCODE_NFC:
- g_snprintf ( szText, nMax, "SoE: NFC (%s, '%s') : %u Bytes", tmp, elm, (guint)(soe_length-ETHERCAT_SOE_HEADER_LEN));
+ snprintf ( szText, nMax, "SoE: NFC (%s, '%s') : %u Bytes", tmp, elm, (guint)(soe_length-ETHERCAT_SOE_HEADER_LEN));
break;
case 6:
- g_snprintf ( szText, nMax, "SoE: EMGCY");
+ snprintf ( szText, nMax, "SoE: EMGCY");
break;
default:
- g_snprintf ( szText, nMax, "SoE:");
+ snprintf ( szText, nMax, "SoE:");
}
}
else
- g_snprintf ( szText, nMax, "SoE: FragmentsLeft %d", soe.anSoeHeaderDataUnion.FragmentsLeft);
+ snprintf ( szText, nMax, "SoE: FragmentsLeft %d", soe.anSoeHeaderDataUnion.FragmentsLeft);
}
else
- g_snprintf ( szText, nMax, "SoE: Error %04x", tvb_get_letohs(tvb, offset));
+ snprintf ( szText, nMax, "SoE: Error %04x", tvb_get_letohs(tvb, offset));
}
/* ethercat mailbox */
diff --git a/plugins/epan/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c
index 09ae5faa0b..083563c012 100644
--- a/plugins/epan/ethercat/packet-ethercat-datagram.c
+++ b/plugins/epan/ethercat/packet-ethercat-datagram.c
@@ -1330,26 +1330,26 @@ static void EcSummaryFormater(guint32 datalength, tvbuff_t *tvb, gint offset, ch
{
guint16 len = ecFirst.len&0x07ff;
guint16 cnt = get_wc(&ecFirst, tvb, offset);
- g_snprintf ( szText, nMax, "'%s': Len: %d, Adp 0x%x, Ado 0x%x, Wc %d ",
+ snprintf ( szText, nMax, "'%s': Len: %d, Adp 0x%x, Ado 0x%x, Wc %d ",
convertEcCmdToText(ecFirst.cmd, EcCmdShort), len, ecFirst.anAddrUnion.a.adp, ecFirst.anAddrUnion.a.ado, cnt );
}
else if ( nSub == 2 )
{
- g_snprintf ( szText, nMax, "%d Cmds, '%s': len %d, '%s': len %d ",
+ snprintf ( szText, nMax, "%d Cmds, '%s': len %d, '%s': len %d ",
nSub, convertEcCmdToText(nCmds[0], EcCmdShort), nLens[0], convertEcCmdToText(nCmds[1], EcCmdShort), nLens[1]);
}
else if ( nSub == 3 )
{
- g_snprintf ( szText, nMax, "%d Cmds, '%s': len %d, '%s': len %d, '%s': len %d",
+ snprintf ( szText, nMax, "%d Cmds, '%s': len %d, '%s': len %d, '%s': len %d",
nSub, convertEcCmdToText(nCmds[0], EcCmdShort), nLens[0], convertEcCmdToText(nCmds[1], EcCmdShort), nLens[1], convertEcCmdToText(nCmds[2], EcCmdShort), nLens[2]);
}
else if ( nSub == 4 )
{
- g_snprintf ( szText, nMax, "%d Cmds, '%s': len %d, '%s': len %d, '%s': len %d, '%s': len %d",
+ snprintf ( szText, nMax, "%d Cmds, '%s': len %d, '%s': len %d, '%s': len %d, '%s': len %d",
nSub, convertEcCmdToText(nCmds[0], EcCmdShort), nLens[0], convertEcCmdToText(nCmds[1], EcCmdShort), nLens[1], convertEcCmdToText(nCmds[2], EcCmdShort), nLens[2], convertEcCmdToText(nCmds[3], EcCmdShort), nLens[3]);
}
else
- g_snprintf ( szText, nMax, "%d Cmds, SumLen %d, '%s'... ",
+ snprintf ( szText, nMax, "%d Cmds, SumLen %d, '%s'... ",
nSub, nLen, convertEcCmdToText(ecFirst.cmd, EcCmdShort));
}
@@ -1359,9 +1359,9 @@ static void EcCmdFormatter(guint8 cmd, char *szText, gint nMax)
const gchar *szCmd = try_val_to_str_idx((guint32)cmd, EcCmdLong, &idx);
if ( idx != -1 )
- g_snprintf(szText, nMax, "Cmd : %d (%s)", cmd, szCmd);
+ snprintf(szText, nMax, "Cmd : %d (%s)", cmd, szCmd);
else
- g_snprintf(szText, nMax, "Cmd : %d (Unknown command)", cmd);
+ snprintf(szText, nMax, "Cmd : %d (Unknown command)", cmd);
}
@@ -1388,20 +1388,20 @@ static void EcSubFormatter(tvbuff_t *tvb, gint offset, char *szText, gint nMax)
case EC_CMD_TYPE_BRW:
case EC_CMD_TYPE_ARMW:
case EC_CMD_TYPE_FRMW:
- g_snprintf ( szText, nMax, "EtherCAT datagram: Cmd: '%s' (%d), Len: %d, Adp 0x%x, Ado 0x%x, Cnt %d",
+ snprintf ( szText, nMax, "EtherCAT datagram: Cmd: '%s' (%d), Len: %d, Adp 0x%x, Ado 0x%x, Cnt %d",
convertEcCmdToText(ecParser.cmd, EcCmdShort), ecParser.cmd, len, ecParser.anAddrUnion.a.adp, ecParser.anAddrUnion.a.ado, cnt);
break;
case EC_CMD_TYPE_LRD:
case EC_CMD_TYPE_LWR:
case EC_CMD_TYPE_LRW:
- g_snprintf ( szText, nMax, "EtherCAT datagram: Cmd: '%s' (%d), Len: %d, Addr 0x%x, Cnt %d",
+ snprintf ( szText, nMax, "EtherCAT datagram: Cmd: '%s' (%d), Len: %d, Addr 0x%x, Cnt %d",
convertEcCmdToText(ecParser.cmd, EcCmdShort), ecParser.cmd, len, ecParser.anAddrUnion.addr, cnt);
break;
case EC_CMD_TYPE_EXT:
- g_snprintf ( szText, nMax, "EtherCAT datagram: Cmd: 'EXT' (%d), Len: %d", ecParser.cmd, len);
+ snprintf ( szText, nMax, "EtherCAT datagram: Cmd: 'EXT' (%d), Len: %d", ecParser.cmd, len);
break;
default:
- g_snprintf ( szText, nMax, "EtherCAT datagram: Cmd: 'Unknown' (%d), Len: %d", ecParser.cmd, len);
+ snprintf ( szText, nMax, "EtherCAT datagram: Cmd: 'Unknown' (%d), Len: %d", ecParser.cmd, len);
}
}
diff --git a/plugins/epan/ethercat/packet-ioraw.c b/plugins/epan/ethercat/packet-ioraw.c
index 273e085918..3122db1c8e 100644
--- a/plugins/epan/ethercat/packet-ioraw.c
+++ b/plugins/epan/ethercat/packet-ioraw.c
@@ -33,7 +33,7 @@ static int hf_ioraw_data = -1;
/*ioraw*/
static void IoRawSummaryFormater( char *szText, int nMax)
{
- g_snprintf ( szText, nMax, "Raw IO Data" );
+ snprintf ( szText, nMax, "Raw IO Data" );
}
static int dissect_ioraw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/plugins/epan/ethercat/packet-nv.c b/plugins/epan/ethercat/packet-nv.c
index d66f2d2578..12965ee40c 100644
--- a/plugins/epan/ethercat/packet-nv.c
+++ b/plugins/epan/ethercat/packet-nv.c
@@ -47,7 +47,7 @@ static void NvSummaryFormater(tvbuff_t *tvb, gint offset, char *szText, int nMax
{
guint32 nvOffset = offset;
- g_snprintf ( szText, nMax, "Network Vars from %d.%d.%d.%d.%d.%d - %d Var(s)",
+ snprintf ( szText, nMax, "Network Vars from %d.%d.%d.%d.%d.%d - %d Var(s)",
tvb_get_guint8(tvb, nvOffset),
tvb_get_guint8(tvb, nvOffset+1),
tvb_get_guint8(tvb, nvOffset+2),
@@ -61,7 +61,7 @@ static void NvPublisherFormater(tvbuff_t *tvb, gint offset, char *szText, int nM
{
guint32 nvOffset = offset;
- g_snprintf ( szText, nMax, "Publisher %d.%d.%d.%d.%d.%d",
+ snprintf ( szText, nMax, "Publisher %d.%d.%d.%d.%d.%d",
tvb_get_guint8(tvb, nvOffset),
tvb_get_guint8(tvb, nvOffset+1),
tvb_get_guint8(tvb, nvOffset+2),
@@ -72,7 +72,7 @@ static void NvPublisherFormater(tvbuff_t *tvb, gint offset, char *szText, int nM
static void NvVarHeaderFormater(tvbuff_t *tvb, gint offset, char *szText, int nMax)
{
- g_snprintf ( szText, nMax, "Variable - Id = %d, Length = %d",
+ snprintf ( szText, nMax, "Variable - Id = %d, Length = %d",
tvb_get_letohs(tvb, offset),
tvb_get_letohs(tvb, offset+4));
}
diff --git a/plugins/epan/irda/packet-irda.c b/plugins/epan/irda/packet-irda.c
index 79dc458b96..2a6ac60499 100644
--- a/plugins/epan/irda/packet-irda.c
+++ b/plugins/epan/irda/packet-irda.c
@@ -492,7 +492,7 @@ static guint dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, gb
head = tvb_get_guint8(tvb, offset);
- g_snprintf(buf, 128, ", Credit=%d", head & ~TTP_PARAMETERS);
+ snprintf(buf, 128, ", Credit=%d", head & ~TTP_PARAMETERS);
col_append_str(pinfo->cinfo, COL_INFO, buf);
if (root)
@@ -743,7 +743,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
break;
case IAS_OCT_SEQ:
- g_snprintf(buf, 300, ", %d Octets", tvb_get_ntohs(tvb, offset + 7));
+ snprintf(buf, 300, ", %d Octets", tvb_get_ntohs(tvb, offset + 7));
break;
case IAS_STRING:
@@ -1764,7 +1764,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
circuit_id = tvb_get_guint8(tvb, 0);
/* initially set address columns to connection address */
- g_snprintf(addr, sizeof(addr)-1, "0x%02X", circuit_id >> 1);
+ snprintf(addr, sizeof(addr)-1, "0x%02X", circuit_id >> 1);
col_add_str(pinfo->cinfo, COL_DEF_SRC, addr);
col_add_str(pinfo->cinfo, COL_DEF_DST, addr);
diff --git a/plugins/epan/mate/mate_grammar.lemon b/plugins/epan/mate/mate_grammar.lemon
index 73b320d8d6..ef8289ea8f 100644
--- a/plugins/epan/mate/mate_grammar.lemon
+++ b/plugins/epan/mate/mate_grammar.lemon
@@ -79,7 +79,7 @@ static void configuration_error(mate_config* mc, const gchar* fmt, ...) {
va_list list;
va_start( list, fmt );
- g_vsnprintf(error_buffer,sizeof(error_buffer),fmt,list);
+ vsnprintf(error_buffer,sizeof(error_buffer),fmt,list);
va_end( list );
i = (gint) mc->config_stack->len;
diff --git a/plugins/epan/mate/mate_setup.c b/plugins/epan/mate/mate_setup.c
index 727b536bd7..3f88abbd2d 100644
--- a/plugins/epan/mate/mate_setup.c
+++ b/plugins/epan/mate/mate_setup.c
@@ -21,7 +21,7 @@ static void report_error(mate_config* mc, const gchar* fmt, ...) {
va_list list;
va_start( list, fmt );
- g_vsnprintf(error_buffer,DEBUG_BUFFER_SIZE,fmt,list);
+ vsnprintf(error_buffer,DEBUG_BUFFER_SIZE,fmt,list);
va_end( list );
g_string_append(mc->config_error,error_buffer);
diff --git a/plugins/epan/mate/mate_util.c b/plugins/epan/mate/mate_util.c
index 6bc6f63f5d..30a4f098b4 100644
--- a/plugins/epan/mate/mate_util.c
+++ b/plugins/epan/mate/mate_util.c
@@ -38,7 +38,7 @@ void dbg_print(const gint* which, gint how, FILE* where, const gchar* fmt, ... )
if ( ! which || *which < how ) return;
va_start( list, fmt );
- g_vsnprintf(debug_buffer,DEBUG_BUFFER_SIZE,fmt,list);
+ vsnprintf(debug_buffer,DEBUG_BUFFER_SIZE,fmt,list);
va_end( list );
if (! where) {
@@ -193,7 +193,7 @@ gchar* scs_subscribe_printf(SCS_collection* c, gchar* fmt, ...) {
static gchar buf[SCS_HUGE_SIZE];
va_start( list, fmt );
- g_vsnprintf(buf, SCS_HUGE_SIZE, fmt, list);
+ vsnprintf(buf, SCS_HUGE_SIZE, fmt, list);
va_end( list );
return scs_subscribe(c,buf);
@@ -1559,7 +1559,7 @@ extern LoAL* loal_from_file(gchar* filename) {
i = 0;
name[i++] = c;
name[i] = '\0';
- g_snprintf(linenum_buf,MAX_ITEM_LEN,"%s:%u",filename,linenum);
+ snprintf(linenum_buf,MAX_ITEM_LEN,"%s:%u",filename,linenum);
curr = new_avpl(linenum_buf);
continue;
case '#':
diff --git a/plugins/epan/opcua/opcua_simpletypes.c b/plugins/epan/opcua/opcua_simpletypes.c
index 945b528794..dc1bb0457b 100644
--- a/plugins/epan/opcua/opcua_simpletypes.c
+++ b/plugins/epan/opcua/opcua_simpletypes.c
@@ -1134,7 +1134,7 @@ void parseArrayComplex(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint
for (i=0; i<iLen; i++)
{
char szNum[20];
- g_snprintf(szNum, 20, "[%i]", i);
+ snprintf(szNum, 20, "[%i]", i);
(*pParserFunction)(subtree, tvb, pinfo, pOffset, szNum);
}
proto_item_set_end(ti, tvb, *pOffset);
diff --git a/plugins/epan/profinet/packet-pn-ptcp.c b/plugins/epan/profinet/packet-pn-ptcp.c
index 6a753a5f62..d6b1bb6e80 100644
--- a/plugins/epan/profinet/packet-pn-ptcp.c
+++ b/plugins/epan/profinet/packet-pn-ptcp.c
@@ -671,11 +671,11 @@ dissect_PNPTCP_RTSyncPDU(tvbuff_t *tvb, int offset,
delay1ns_64 = ((guint64) delay10ns) * 10 + delay1ns_8 + delay1ns_32;
delayms = (guint32) (delay1ns_64 / (1000 * 1000));
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11" G_GINT64_MODIFIER "uns",
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11" PRIu64 "ns",
name, seq_id, delay1ns_64);
- proto_item_append_text(item, "%s: Sequence=%u, Delay=%" G_GINT64_MODIFIER "uns",
+ proto_item_append_text(item, "%s: Sequence=%u, Delay=%" PRIu64 "ns",
name_short, seq_id, delay1ns_64);
- proto_item_append_text(header_item, ": Sequence=%u, Delay=%" G_GINT64_MODIFIER "uns",
+ proto_item_append_text(header_item, ": Sequence=%u, Delay=%" PRIu64 "ns",
seq_id, delay1ns_64);
if (delay1ns_64 != 0)
diff --git a/plugins/epan/profinet/packet-pn-rt.c b/plugins/epan/profinet/packet-pn-rt.c
index b03e946647..9564c55590 100644
--- a/plugins/epan/profinet/packet-pn-rt.c
+++ b/plugins/epan/profinet/packet-pn-rt.c
@@ -843,7 +843,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
u8DataStatus = tvb_get_guint8(tvb, pdu_len - 2);
u8TransferStatus = tvb_get_guint8(tvb, pdu_len - 1);
- g_snprintf (szFieldSummary, sizeof(szFieldSummary),
+ snprintf (szFieldSummary, sizeof(szFieldSummary),
"%sID:0x%04x, Len:%4u, Cycle:%5u (%s,%s,%s,%s)",
pszProtAddInfo, u16FrameID, pdu_len - 2 - 4, u16CycleCounter,
(u8DataStatus & 0x04) ? "Valid" : "Invalid",
@@ -860,7 +860,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
u8TransferStatus = 0;
/* acyclic transfer has no fields at the end */
- g_snprintf (szFieldSummary, sizeof(szFieldSummary),
+ snprintf (szFieldSummary, sizeof(szFieldSummary),
"%sID:0x%04x, Len:%4u",
pszProtAddInfo, u16FrameID, pdu_len - 2);
@@ -907,7 +907,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
/* update column info now */
if (u16FrameID == 0xFE02)
{
- g_snprintf(szFieldSummary, sizeof(szFieldSummary), "%s", "");
+ snprintf(szFieldSummary, sizeof(szFieldSummary), "%s", "");
}
col_add_str(pinfo->cinfo, COL_INFO, szFieldSummary);
col_set_str(pinfo->cinfo, COL_PROTOCOL, pszProtShort);
diff --git a/plugins/epan/stats_tree/pinfo_stats_tree.c b/plugins/epan/stats_tree/pinfo_stats_tree.c
index 4600918ce4..ce715c887b 100644
--- a/plugins/epan/stats_tree/pinfo_stats_tree.c
+++ b/plugins/epan/stats_tree/pinfo_stats_tree.c
@@ -230,7 +230,7 @@ static tap_packet_status dsts_stats_tree_packet(stats_tree *st, packet_info *pin
tick_stat_node(st, st_str, 0, FALSE);
ip_dst_node = tick_stat_node(st, address_to_str(pinfo->pool, &pinfo->net_dst), st_node, TRUE);
protocol_node = tick_stat_node(st, port_type_to_str(pinfo->ptype), ip_dst_node, TRUE);
- g_snprintf(str, sizeof(str) - 1, "%u", pinfo->destport);
+ snprintf(str, sizeof(str) - 1, "%u", pinfo->destport);
tick_stat_node(st, str, protocol_node, TRUE);
return TAP_PACKET_REDRAW;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 02:37:49 +0000