1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00

debug: Add length argument to Debug1()

This the first step in avoiding potentially repeated length
calculations in the backends.  The length is known at call time for
most usual callers, so pass it down.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Martin Schwenke 2016-12-02 16:29:56 +11:00 committed by Volker Lendecke
parent 9f8be709c4
commit 3085a7d317

View File

@ -1456,7 +1456,7 @@ void check_log_size( void )
This is called by format_debug_text().
************************************************************************/
static void Debug1(const char *msg)
static void Debug1(const char *msg, size_t msg_len)
{
int old_errno = errno;
@ -1475,7 +1475,7 @@ static void Debug1(const char *msg)
do {
ret = write(dbgc_config[DBGC_ALL].fd,
msg,
strlen(msg));
msg_len);
} while (ret == -1 && errno == EINTR);
}
break;
@ -1496,7 +1496,7 @@ static void Debug1(const char *msg)
static void bufr_print( void )
{
format_bufr[format_pos] = '\0';
(void)Debug1(format_bufr);
(void)Debug1(format_bufr, format_pos);
format_pos = 0;
}
@ -1542,8 +1542,9 @@ static void format_debug_text( const char *msg )
* continuation indicator.
*/
if (format_pos >= FORMAT_BUFR_SIZE - 1) {
const char cont[] = " +>\n";
bufr_print();
(void)Debug1( " +>\n" );
(void)Debug1(cont , sizeof(cont) - 1);
}
}