From 65c5a1c0ba2cc3dc8e45a499c42191016e658b20 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 8 Sep 2001 02:59:23 +0000 Subject: convert more code to using d_printf (This used to be commit 60d297303488ed583537ca2853828fccd6da2ade) --- source3/web/swat.c | 330 ++++++++++++++++++++++++++--------------------------- 1 file changed, 165 insertions(+), 165 deletions(-) (limited to 'source3/web') diff --git a/source3/web/swat.c b/source3/web/swat.c index 5dcfe3d658..f963c16ccf 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -114,7 +114,7 @@ static int include_html(char *fname) int ret; if (!f) { - printf("ERROR: Can't open %s\n", fname); + d_printf("ERROR: Can't open %s\n", fname); return 0; } @@ -134,13 +134,13 @@ static int include_html(char *fname) static void print_header(void) { if (!cgi_waspost()) { - printf("Expires: 0\r\n"); + d_printf("Expires: 0\r\n"); } - printf("Content-type: text/html\r\n\r\n"); + d_printf("Content-type: text/html\r\n\r\n"); if (!include_html("include/header.html")) { - printf("\n"); - printf("\n\nSamba Web Administration Tool\n\n\n\n"); + d_printf("\n"); + d_printf("\n\nSamba Web Administration Tool\n\n\n\n"); } } @@ -150,7 +150,7 @@ static void print_header(void) static void print_footer(void) { if (!include_html("include/footer.html")) { - printf("\n\n\n"); + d_printf("\n\n\n"); } } @@ -169,100 +169,100 @@ static void show_parameter(int snum, struct parm_struct *parm) str = stripspace(parm->label); strupper (str); - printf("Help       %s", + d_printf("Help       %s", str, parm->label); switch (parm->type) { case P_CHAR: - printf("", + d_printf("", make_parm_name(parm->label), *(char *)ptr); - printf("", + d_printf("", make_parm_name(parm->label),(char)(parm->def.cvalue)); break; case P_LIST: - printf("label)); if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) { char **list = *(char ***)ptr; for (;*list;list++) { - printf("%s%s", *list, ((*(list+1))?" ":"")); + d_printf("%s%s", *list, ((*(list+1))?" ":"")); } } - printf("\">"); - printf(""); + d_printf("label)); if (parm->def.lvalue) { char **list = (char **)(parm->def.lvalue); for (; *list; list++) { - printf("%s%s", *list, ((*(list+1))?" ":"")); + d_printf("%s%s", *list, ((*(list+1))?" ":"")); } } - printf("\'\">"); + d_printf("\'\">"); break; case P_STRING: case P_USTRING: - printf("", + d_printf("", make_parm_name(parm->label), *(char **)ptr); - printf("", + d_printf("", make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue))); break; case P_GSTRING: case P_UGSTRING: - printf("", + d_printf("", make_parm_name(parm->label), (char *)ptr); - printf("", + d_printf("", make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue))); break; case P_BOOL: - printf(""); - printf("", + d_printf(""); + d_printf("", make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1); break; case P_BOOLREV: - printf(""); - printf("", + d_printf(""); + d_printf("", make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0); break; case P_INTEGER: - printf("", make_parm_name(parm->label), *(int *)ptr); - printf("", + d_printf("", make_parm_name(parm->label), *(int *)ptr); + d_printf("", make_parm_name(parm->label),(int)(parm->def.ivalue)); break; case P_OCTAL: - printf("", make_parm_name(parm->label), octal_string(*(int *)ptr)); - printf("", + d_printf("", make_parm_name(parm->label), octal_string(*(int *)ptr)); + d_printf("", make_parm_name(parm->label), octal_string((int)(parm->def.ivalue))); break; case P_ENUM: - printf("",make_parm_name(parm->label)); for (i=0;parm->enum_list[i].name;i++) { if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) { - printf("