Skip to content

Add sx_puts, sx_fputs #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2018
Merged

Add sx_puts, sx_fputs #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e91c4be
Fix _getch define in test.c for non-Linux Unices
sometimesfood Oct 29, 2018
5510cf1
Add sx_puts, sx_fputs
sometimesfood Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/examples/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
#if defined(WIN32) || defined(WIN64)
#pragma warning(disable : 4996)
#include <conio.h>
#else
#define _getch getchar
#endif

#include <stdio.h>
#ifdef linux
//#include <curses.h>
#define _getch getchar
#endif
#include <ctype.h>
#include <stdlib.h>
#include <time.h>
Expand Down Expand Up @@ -601,7 +599,7 @@ void test_NodeXPath(void)
XMLNode_add_child(&node, &node1);

buf = NULL;
sx_printf(XMLNode_get_XPath(&node1, &buf, true));
sx_puts(XMLNode_get_XPath(&node1, &buf, true));
free(buf);
}

Expand Down
10 changes: 5 additions & 5 deletions src/sxmlc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,12 +856,12 @@ static int _count_new_char_line(const SXML_CHAR* str, int nb_char_tab, int cur_s
static int _print_formatting(const XMLNode* node, FILE* f, const SXML_CHAR* tag_sep, const SXML_CHAR* child_sep, int nb_char_tab, int cur_sz_line)
{
if (tag_sep != NULL) {
sx_fprintf(f, tag_sep);
sx_fputs(tag_sep, f);
cur_sz_line = _count_new_char_line(tag_sep, nb_char_tab, cur_sz_line);
}
if (child_sep != NULL) {
for (node = node->father; node != NULL; node = node->father) {
sx_fprintf(f, child_sep);
sx_fputs(child_sep, f);
cur_sz_line = _count_new_char_line(child_sep, nb_char_tab, cur_sz_line);
}
}
Expand Down Expand Up @@ -915,13 +915,13 @@ static int _XMLNode_print_header(const XMLNode* node, FILE* f, const SXML_CHAR*
cur_sz_line = _print_formatting(node, f, tag_sep, child_sep, nb_char_tab, cur_sz_line);
/* Add extra separator, as if new line was a child of the previous one */
if (child_sep != NULL) {
sx_fprintf(f, child_sep);
sx_fputs(child_sep, f);
cur_sz_line = _count_new_char_line(child_sep, nb_char_tab, cur_sz_line);
}
}
/* Attribute name */
if (attr_sep != NULL) {
sx_fprintf(f, attr_sep);
sx_fputs(attr_sep, f);
cur_sz_line = _count_new_char_line(attr_sep, nb_char_tab, cur_sz_line);
sx_fprintf(f, C2SX("%s="), node->attributes[i].name);
} else
Expand Down Expand Up @@ -2269,7 +2269,7 @@ int fprintHTML(FILE* f, SXML_CHAR* str)
if (*p != HTML_SPECIAL_DICT[i].chr)
continue;
if (f != NULL)
sx_fprintf(f, HTML_SPECIAL_DICT[i].html);
sx_fputs(HTML_SPECIAL_DICT[i].html, f);
n += HTML_SPECIAL_DICT[i].html_len;
break;
}
Expand Down
4 changes: 4 additions & 0 deletions src/sxmlc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ extern "C" {
#define sx_sprintf swprintf
#define sx_fgetc fgetwc
#define sx_fputc fputwc
#define sx_puts putws
#define sx_fputs fputws
#define sx_isspace iswspace
#if defined(WIN32) || defined(WIN64)
#define sx_fopen _wfopen
Expand All @@ -82,6 +84,8 @@ extern "C" {
#define sx_sprintf sprintf
#define sx_fgetc fgetc
#define sx_fputc fputc
#define sx_puts puts
#define sx_fputs fputs
#define sx_isspace(ch) isspace((int)ch)
#define sx_fopen fopen
#define sx_fclose fclose
Expand Down