Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
806c235e
Commit
806c235e
authored
Apr 11, 2003
by
Mark Andrews
Browse files
1458. [cleanup] sprintf() -> snprintf().
parent
935000aa
Changes
16
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
806c235e
1458. [cleanup] sprintf() -> snprintf().
1457. [port] Provide strlcat() and strlcpy() for platforms without
them.
...
...
lib/dns/byaddr.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: byaddr.c,v 1.3
2
200
2
/0
8/27 04:53:42
marka Exp $ */
/* $Id: byaddr.c,v 1.3
3
200
3
/0
4/11 07:25:24
marka Exp $ */
#include
<config.h>
...
...
@@ -98,11 +98,12 @@ dns_byaddr_createptrname2(isc_netaddr_t *address, unsigned int options,
bytes
=
(
unsigned
char
*
)(
&
address
->
type
);
if
(
address
->
family
==
AF_INET
)
{
(
void
)
sprintf
(
textname
,
"%u.%u.%u.%u.in-addr.arpa."
,
(
bytes
[
3
]
&
0xff
),
(
bytes
[
2
]
&
0xff
),
(
bytes
[
1
]
&
0xff
),
(
bytes
[
0
]
&
0xff
));
(
void
)
snprintf
(
textname
,
sizeof
(
textname
),
"%u.%u.%u.%u.in-addr.arpa."
,
(
bytes
[
3
]
&
0xff
),
(
bytes
[
2
]
&
0xff
),
(
bytes
[
1
]
&
0xff
),
(
bytes
[
0
]
&
0xff
));
}
else
if
(
address
->
family
==
AF_INET6
)
{
cp
=
textname
;
for
(
i
=
15
;
i
>=
0
;
i
--
)
{
...
...
lib/dns/masterdump.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.c,v 1.6
6
2003/0
1/22 06:37:0
4 marka Exp $ */
/* $Id: masterdump.c,v 1.6
7
2003/0
4/11 07:25:2
4 marka Exp $ */
#include
<config.h>
...
...
@@ -375,7 +375,8 @@ rdataset_totext(dns_rdataset_t *rdataset,
unsigned
int
length
;
INDENT_TO
(
ttl_column
);
length
=
sprintf
(
ttlbuf
,
"%u"
,
rdataset
->
ttl
);
length
=
snprintf
(
ttlbuf
,
sizeof
(
ttlbuf
),
"%u"
,
rdataset
->
ttl
);
INSIST
(
length
<=
sizeof
(
ttlbuf
));
isc_buffer_availableregion
(
target
,
&
r
);
if
(
r
.
length
<
length
)
...
...
lib/dns/message.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: message.c,v 1.21
6
2003/0
1/24
0
4
:25:5
3
marka Exp $ */
/* $Id: message.c,v 1.21
7
2003/0
4/11
0
7
:25:
2
5 marka Exp $ */
/***
*** Imports
...
...
@@ -3023,7 +3023,7 @@ dns_message_totext(dns_message_t *msg, const dns_master_style_t *style,
ADD_STRING
(
target
,
", status: "
);
ADD_STRING
(
target
,
rcodetext
[
msg
->
rcode
]);
ADD_STRING
(
target
,
", id: "
);
sprintf
(
buf
,
"%6u"
,
msg
->
id
);
s
n
printf
(
buf
,
sizeof
(
buf
),
"%6u"
,
msg
->
id
);
ADD_STRING
(
target
,
buf
);
ADD_STRING
(
target
,
"
\n
;; flags: "
);
if
((
msg
->
flags
&
DNS_MESSAGEFLAG_QR
)
!=
0
)
...
...
@@ -3045,24 +3045,28 @@ dns_message_totext(dns_message_t *msg, const dns_master_style_t *style,
}
else
{
ADD_STRING
(
target
,
"; ZONE: "
);
}
sprintf
(
buf
,
"%1u"
,
msg
->
counts
[
DNS_SECTION_QUESTION
]);
snprintf
(
buf
,
sizeof
(
buf
),
"%1u"
,
msg
->
counts
[
DNS_SECTION_QUESTION
]);
ADD_STRING
(
target
,
buf
);
if
(
msg
->
opcode
!=
dns_opcode_update
)
{
ADD_STRING
(
target
,
", ANSWER: "
);
}
else
{
ADD_STRING
(
target
,
", PREREQ: "
);
}
sprintf
(
buf
,
"%1u"
,
msg
->
counts
[
DNS_SECTION_ANSWER
]);
snprintf
(
buf
,
sizeof
(
buf
),
"%1u"
,
msg
->
counts
[
DNS_SECTION_ANSWER
]);
ADD_STRING
(
target
,
buf
);
if
(
msg
->
opcode
!=
dns_opcode_update
)
{
ADD_STRING
(
target
,
", AUTHORITY: "
);
}
else
{
ADD_STRING
(
target
,
", UPDATE: "
);
}
sprintf
(
buf
,
"%1u"
,
msg
->
counts
[
DNS_SECTION_AUTHORITY
]);
snprintf
(
buf
,
sizeof
(
buf
),
"%1u"
,
msg
->
counts
[
DNS_SECTION_AUTHORITY
]);
ADD_STRING
(
target
,
buf
);
ADD_STRING
(
target
,
", ADDITIONAL: "
);
sprintf
(
buf
,
"%1u"
,
msg
->
counts
[
DNS_SECTION_ADDITIONAL
]);
snprintf
(
buf
,
sizeof
buf
,
"%1u"
,
msg
->
counts
[
DNS_SECTION_ADDITIONAL
]);
ADD_STRING
(
target
,
buf
);
ADD_STRING
(
target
,
"
\n
"
);
}
...
...
lib/dns/name.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: name.c,v 1.13
8
2003/0
1/08 04:42
:2
2
marka Exp $ */
/* $Id: name.c,v 1.13
9
2003/0
4/11 07:25
:2
5
marka Exp $ */
#include
<config.h>
...
...
@@ -1221,10 +1221,12 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
trem
--
;
nlen
--
;
}
else
{
char
buf
[
5
];
if
(
trem
<
4
)
return
(
ISC_R_NOSPACE
);
sprintf
(
tdata
,
"
\\
%03u"
,
c
);
snprintf
(
buf
,
sizeof
(
buf
),
"
\\
%03u"
,
c
);
memcpy
(
tdata
,
buf
,
4
);
tdata
+=
4
;
trem
-=
4
;
ndata
++
;
...
...
lib/dns/rdata.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdata.c,v 1.17
3
2003/0
1/18 02:40:59
marka Exp $ */
/* $Id: rdata.c,v 1.17
4
2003/0
4/11 07:25:25
marka Exp $ */
#include
<config.h>
#include
<ctype.h>
...
...
@@ -782,11 +782,11 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
TOTEXTSWITCH
if
(
use_default
)
{
s
printf
(
buf
,
"
\\
# "
);
s
trlcpy
(
buf
,
"
\\
# "
,
sizeof
(
buf
)
);
result
=
str_totext
(
buf
,
target
);
dns_rdata_toregion
(
rdata
,
&
sr
);
INSIST
(
sr
.
length
<
65536
);
sprintf
(
buf
,
"%u"
,
sr
.
length
);
s
n
printf
(
buf
,
sizeof
(
buf
),
"%u"
,
sr
.
length
);
result
=
str_totext
(
buf
,
target
);
if
(
sr
.
length
!=
0
&&
result
==
ISC_R_SUCCESS
)
{
if
((
tctx
->
flags
&
DNS_STYLEFLAG_MULTILINE
)
!=
0
)
...
...
@@ -1037,7 +1037,7 @@ dns_mnemonic_totext(unsigned int value, isc_buffer_t *target,
}
i
++
;
}
sprintf
(
buf
,
"%u"
,
value
);
s
n
printf
(
buf
,
sizeof
buf
,
"%u"
,
value
);
return
(
str_totext
(
buf
,
target
));
}
...
...
@@ -1122,7 +1122,7 @@ dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) {
case
dns_rdataclass_reserved0
:
return
(
str_totext
(
"RESERVED0"
,
target
));
default:
sprintf
(
buf
,
"CLASS%u"
,
rdclass
);
s
n
printf
(
buf
,
sizeof
(
buf
),
"CLASS%u"
,
rdclass
);
return
(
str_totext
(
buf
,
target
));
}
}
...
...
@@ -1197,7 +1197,7 @@ dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target) {
char
buf
[
sizeof
(
"TYPE65536"
)];
if
(
type
>
255
)
{
sprintf
(
buf
,
"TYPE%u"
,
type
);
s
n
printf
(
buf
,
sizeof
buf
,
"TYPE%u"
,
type
);
return
(
str_totext
(
buf
,
target
));
}
...
...
@@ -1377,7 +1377,7 @@ txt_totext(isc_region_t *source, isc_buffer_t *target) {
if
(
*
sp
<
0x20
||
*
sp
>=
0x7f
)
{
if
(
tl
<
4
)
return
(
ISC_R_NOSPACE
);
sprintf
(
tp
,
"
\\
%03u"
,
*
sp
++
);
s
n
printf
(
tp
,
5
,
"
\\
%03u"
,
*
sp
++
);
tp
+=
4
;
tl
-=
4
;
continue
;
...
...
@@ -1936,7 +1936,7 @@ btoa_totext(unsigned char *inbuf, int inbuflen, isc_buffer_t *target) {
* Put byte count and checksum information at end of buffer,
* delimited by 'x'
*/
sprintf
(
buf
,
"x %d %x %x %x"
,
inbuflen
,
Ceor
,
Csum
,
Crot
);
s
n
printf
(
buf
,
sizeof
(
buf
),
"x %d %x %x %x"
,
inbuflen
,
Ceor
,
Csum
,
Crot
);
return
(
str_totext
(
buf
,
target
));
}
...
...
lib/dns/resolver.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.26
2
2003/0
2/26 22:54
:2
8
marka Exp $ */
/* $Id: resolver.c,v 1.26
3
2003/0
4/11 07:25
:2
5
marka Exp $ */
#include
<config.h>
...
...
@@ -5295,7 +5295,7 @@ dns_resolver_create(dns_view_t *view,
DESTROYLOCK
(
&
res
->
buckets
[
i
].
lock
);
goto
cleanup_buckets
;
}
sprintf
(
name
,
"res%u"
,
i
);
s
n
printf
(
name
,
sizeof
(
name
),
"res%u"
,
i
);
isc_task_setname
(
res
->
buckets
[
i
].
task
,
name
,
res
);
ISC_LIST_INIT
(
res
->
buckets
[
i
].
fctxs
);
res
->
buckets
[
i
].
exiting
=
ISC_FALSE
;
...
...
lib/dns/time.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: time.c,v 1.2
2
200
2/11/12 19:50:51
marka Exp $ */
/* $Id: time.c,v 1.2
3
200
3/04/11 07:25:27
marka Exp $ */
#include
<config.h>
...
...
@@ -74,10 +74,10 @@ dns_time64_totext(isc_int64_t t, isc_buffer_t *target) {
tm
.
tm_min
++
;
}
tm
.
tm_sec
=
(
int
)
t
;
/* yy mm dd HH MM SS */
sprintf
(
buf
,
"%04d%02d%02d%02d%02d%02d"
,
tm
.
tm_year
+
1900
,
tm
.
tm_mon
+
1
,
tm
.
tm_mday
,
tm
.
tm_hour
,
tm
.
tm_min
,
tm
.
tm_sec
);
/* yy
yy
mm dd HH MM SS */
s
n
printf
(
buf
,
sizeof
(
buf
),
"%04d%02d%02d%02d%02d%02d"
,
tm
.
tm_year
+
1900
,
tm
.
tm_mon
+
1
,
tm
.
tm_mday
,
tm
.
tm_hour
,
tm
.
tm_min
,
tm
.
tm_sec
);
isc_buffer_availableregion
(
target
,
&
region
);
l
=
strlen
(
buf
);
...
...
lib/isc/lex.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lex.c,v 1.7
5
200
2
/0
3
/11 0
5:38
:27 marka Exp $ */
/* $Id: lex.c,v 1.7
6
200
3
/0
4
/11 0
7:25
:27 marka Exp $ */
#include
<config.h>
...
...
@@ -251,8 +251,7 @@ isc_lex_openstream(isc_lex_t *lex, FILE *stream) {
REQUIRE
(
VALID_LEX
(
lex
));
/* This is safe. */
sprintf
(
name
,
"stream-%p"
,
stream
);
snprintf
(
name
,
sizeof
(
name
),
"stream-%p"
,
stream
);
return
(
new_source
(
lex
,
ISC_TRUE
,
ISC_FALSE
,
stream
,
name
));
}
...
...
@@ -267,8 +266,7 @@ isc_lex_openbuffer(isc_lex_t *lex, isc_buffer_t *buffer) {
REQUIRE
(
VALID_LEX
(
lex
));
/* This is safe. */
sprintf
(
name
,
"buffer-%p"
,
buffer
);
snprintf
(
name
,
sizeof
(
name
),
"buffer-%p"
,
buffer
);
return
(
new_source
(
lex
,
ISC_FALSE
,
ISC_FALSE
,
buffer
,
name
));
}
...
...
lib/isc/log.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: log.c,v 1.8
0
200
2/11/29 01:42:1
8 marka Exp $ */
/* $Id: log.c,v 1.8
1
200
3/04/11 07:25:2
8 marka Exp $ */
/* Principal Authors: DCL */
...
...
@@ -1492,18 +1492,19 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
if
((
channel
->
flags
&
ISC_LOG_PRINTLEVEL
)
!=
0
&&
level_string
[
0
]
==
'\0'
)
{
if
(
level
<
ISC_LOG_CRITICAL
)
sprintf
(
level_string
,
isc_msgcat_get
(
isc_msgcat
,
ISC_MSGSET_LOG
,
ISC_MSG_LEVEL
,
"level %d: "
),
level
);
s
n
printf
(
level_string
,
sizeof
(
level_string
),
isc_msgcat_get
(
isc_msgcat
,
ISC_MSGSET_LOG
,
ISC_MSG_LEVEL
,
"level %d: "
),
level
);
else
if
(
level
>
ISC_LOG_DYNAMIC
)
sprintf
(
level_string
,
"%s %d: "
,
log_level_strings
[
0
],
level
);
snprintf
(
level_string
,
sizeof
(
level_string
),
"%s %d: "
,
log_level_strings
[
0
],
level
);
else
sprintf
(
level_string
,
"%s: "
,
log_level_strings
[
-
level
]);
s
n
printf
(
level_string
,
sizeof
(
level_string
)
,
"%s: "
,
log_level_strings
[
-
level
]);
}
/*
...
...
lib/isc/sockaddr.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sockaddr.c,v 1.5
5
200
2/10/24 03:52:33
marka Exp $ */
/* $Id: sockaddr.c,v 1.5
6
200
3/04/11 07:25:28
marka Exp $ */
#include
<config.h>
...
...
@@ -120,10 +120,10 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) {
*/
switch
(
sockaddr
->
type
.
sa
.
sa_family
)
{
case
AF_INET
:
sprintf
(
pbuf
,
"%u"
,
ntohs
(
sockaddr
->
type
.
sin
.
sin_port
));
s
n
printf
(
pbuf
,
sizeof
(
pbuf
),
"%u"
,
ntohs
(
sockaddr
->
type
.
sin
.
sin_port
));
break
;
case
AF_INET6
:
sprintf
(
pbuf
,
"%u"
,
ntohs
(
sockaddr
->
type
.
sin6
.
sin6_port
));
s
n
printf
(
pbuf
,
sizeof
(
pbuf
),
"%u"
,
ntohs
(
sockaddr
->
type
.
sin6
.
sin6_port
));
break
;
default:
return
(
ISC_R_FAILURE
);
...
...
lib/isccc/cc.c
View file @
806c235e
...
...
@@ -16,7 +16,7 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cc.c,v 1.
6
200
2
/0
3
/1
5
0
4:54:5
8 marka Exp $ */
/* $Id: cc.c,v 1.
7
200
3
/0
4
/1
1
0
7:25:2
8 marka Exp $ */
#include
<config.h>
...
...
@@ -647,7 +647,7 @@ isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, isc_uint32_t i)
size_t
len
;
isccc_region_t
r
;
sprintf
(
b
,
"%u"
,
i
);
s
n
printf
(
b
,
sizeof
(
b
),
"%u"
,
i
);
len
=
strlen
(
b
);
r
.
rstart
=
(
unsigned
char
*
)
b
;
r
.
rend
=
(
unsigned
char
*
)
b
+
len
;
...
...
@@ -792,7 +792,7 @@ isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message,
key
=
malloc
(
len
);
if
(
key
==
NULL
)
return
(
ISC_R_NOMEMORY
);
sprintf
(
key
,
"%s;%s;%s;%s"
,
_frm
,
_to
,
_ser
,
_tim
);
s
n
printf
(
key
,
len
,
"%s;%s;%s;%s"
,
_frm
,
_to
,
_ser
,
_tim
);
value
.
as_uinteger
=
now
;
result
=
isccc_symtab_define
(
symtab
,
key
,
ISCCC_SYMTYPE_CCDUP
,
value
,
isccc_symexists_reject
);
...
...
lib/isccfg/parser.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: parser.c,v 1.10
6
2003/04/1
0
0
2:16:11
marka Exp $ */
/* $Id: parser.c,v 1.10
7
2003/04/1
1
0
7:25:28
marka Exp $ */
#include
<config.h>
...
...
@@ -645,7 +645,8 @@ cfg_obj_asuint64(cfg_obj_t *obj) {
void
cfg_print_uint64
(
cfg_printer_t
*
pctx
,
cfg_obj_t
*
obj
)
{
char
buf
[
32
];
sprintf
(
buf
,
"%"
ISC_PRINT_QUADFORMAT
"u"
,
obj
->
value
.
uint64
);
snprintf
(
buf
,
sizeof
(
buf
),
"%"
ISC_PRINT_QUADFORMAT
"u"
,
obj
->
value
.
uint64
);
cfg_print_cstr
(
pctx
,
buf
);
}
...
...
@@ -2101,13 +2102,16 @@ parser_complain(cfg_parser_t *pctx, isc_boolean_t is_warning,
static
char
message
[
2048
];
int
level
=
ISC_LOG_ERROR
;
const
char
*
prep
=
""
;
size_t
len
;
if
(
is_warning
)
level
=
ISC_LOG_WARNING
;
sprintf
(
where
,
"%s:%u: "
,
current_file
(
pctx
),
pctx
->
line
);
snprintf
(
where
,
sizeof
(
where
),
"%s:%u: "
,
current_file
(
pctx
),
pctx
->
line
);
if
((
unsigned
int
)
vsprintf
(
message
,
format
,
args
)
>=
sizeof
(
message
))
len
=
vsnprintf
(
message
,
sizeof
(
message
),
format
,
args
);
if
(
len
>=
sizeof
(
message
))
FATAL_ERROR
(
__FILE__
,
__LINE__
,
"error message would overflow"
);
...
...
lib/lwres/getnameinfo.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: getnameinfo.c,v 1.3
0
200
1
/0
7
/1
0 18:25:43 gson
Exp $ */
/* $Id: getnameinfo.c,v 1.3
1
200
3
/0
4
/1
1 07:25:29 marka
Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
...
...
@@ -172,7 +172,7 @@ lwres_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
*/
}
else
if
((
flags
&
NI_NUMERICSERV
)
!=
0
||
(
sp
=
getservbyport
(
port
,
proto
))
==
NULL
)
{
sprintf
(
numserv
,
"%d"
,
ntohs
(
port
));
s
n
printf
(
numserv
,
sizeof
(
numserv
),
"%d"
,
ntohs
(
port
));
if
((
strlen
(
numserv
)
+
1
)
>
servlen
)
ERR
(
ENI_MEMORY
);
strcpy
(
serv
,
numserv
);
...
...
lib/lwres/lwinetntop.c
View file @
806c235e
...
...
@@ -17,7 +17,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static
char
rcsid
[]
=
"$Id: lwinetntop.c,v 1.1
0
200
1/11/27 01:56:32 gson
Exp $"
;
"$Id: lwinetntop.c,v 1.1
1
200
3/04/11 07:25:30 marka
Exp $"
;
#endif
/* LIBC_SCCS and not lint */
#include
<config.h>
...
...
@@ -83,9 +83,10 @@ static const char *
inet_ntop4
(
const
unsigned
char
*
src
,
char
*
dst
,
size_t
size
)
{
static
const
char
fmt
[]
=
"%u.%u.%u.%u"
;
char
tmp
[
sizeof
(
"255.255.255.255"
)];
size_t
len
;
if
((
size_t
)
sprintf
(
tmp
,
fmt
,
src
[
0
],
src
[
1
],
src
[
2
],
src
[
3
])
>=
size
)
{
len
=
snprintf
(
tmp
,
sizeof
(
tmp
)
,
fmt
,
src
[
0
],
src
[
1
],
src
[
2
],
src
[
3
])
;
if
(
len
>=
size
)
{
errno
=
ENOSPC
;
return
(
NULL
);
}
...
...
@@ -170,7 +171,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) {
tp
+=
strlen
(
tp
);
break
;
}
tp
+=
sprintf
(
tp
,
"%x"
,
words
[
i
]);
tp
+=
sprintf
(
tp
,
"%x"
,
words
[
i
]);
/* XXX */
}
/* Was it a trailing run of 0x00's? */
if
(
best
.
base
!=
-
1
&&
(
best
.
base
+
best
.
len
)
==
...
...
lib/tests/t_api.c
View file @
806c235e
...
...
@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: t_api.c,v 1.
49
200
2
/0
8/27 04:53:43
marka Exp $ */
/* $Id: t_api.c,v 1.
50
200
3
/0
4/11 07:25:31
marka Exp $ */
#include
<config.h>
...
...
@@ -253,7 +253,7 @@ main(int argc, char **argv) {
* Output start stanza to journal.
*/
sprintf
(
T_buf
,
"%s:"
,
argv
[
0
]);
s
n
printf
(
T_buf
,
sizeof
(
T_buf
),
"%s:"
,
argv
[
0
]);
len
=
strlen
(
T_buf
);
(
void
)
t_getdate
(
T_buf
+
len
,
T_BIGBUF
-
len
);
t_putinfo
(
"S"
,
T_buf
);
...
...
@@ -334,7 +334,7 @@ main(int argc, char **argv) {
++
tnum
;
}
sprintf
(
T_buf
,
"%s:"
,
argv
[
0
]);
s
n
printf
(
T_buf
,
sizeof
(
T_buf
),
"%s:"
,
argv
[
0
]);
len
=
strlen
(
T_buf
);
(
void
)
t_getdate
(
T_buf
+
len
,
T_BIGBUF
-
len
);
t_putinfo
(
"E"
,
T_buf
);
...
...
@@ -353,7 +353,7 @@ t_assert(const char *component, int anum, int class, const char *what, ...) {
* Format text to a buffer.
*/
va_start
(
args
,
what
);
(
void
)
vsprintf
(
T_buf
,
what
,
args
);
(
void
)
vs
n
printf
(
T_buf
,
sizeof
(
T_buf
),
what
,
args
);
va_end
(
args
);
(
void
)
t_putinfo
(
"A"
,
T_buf
);
...
...
@@ -365,7 +365,7 @@ t_info(const char *format, ...) {
va_list
args
;
va_start
(
args
,
format
);
(
void
)
vsprintf
(
T_buf
,
format
,
args
);
(
void
)
vs
n
printf
(
T_buf
,
sizeof
(
T_buf
),
format
,
args
);
va_end
(
args
);
(
void
)
t_putinfo
(
"I"
,
T_buf
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment