Skip to content

Commit 9eed44b

Browse files
committed
🛠 wrong type in examples
1 parent 9dd06e5 commit 9eed44b

File tree

4 files changed

+31
-15
lines changed

4 files changed

+31
-15
lines changed

.github/workflows/push-pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
- uses: seanmiddleditch/gha-setup-ninja@master
4949
if: ${{matrix.os == 'windows'}}
5050
# actual runs
51-
- name: Execute CMake Workflow (Windows)
51+
- name: Execute CMake Workflow (Windows and MSVC)
5252
if: ${{(matrix.os == 'windows' && matrix.compiler == 'msvc')}}
5353
shell: vsdevenv x64 powershell {0}
5454
run: cmake --workflow --preset ${{matrix.compiler}}
55-
- name: Execute CMake Workflow (Non-Windows)
55+
- name: Execute CMake Workflow (Non-Windows and Non-MSVC)
5656
if: ${{(matrix.os != 'windows' || matrix.compiler != 'msvc')}}
5757
run: cmake --workflow --preset ${{matrix.compiler}}

examples/basic/source/errors_shift_jis_to_utf8.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ int main(int argc, char* argv[]) {
8686
: "\xe2\x9d\x8e"),
8787
(unsigned int)((unsigned char)input_data[input_read]));
8888
fprintf(stdout, "%s Conversion Result:\n", has_err ? "Partial" : "Complete");
89-
cnc_print_str_c32n(output_written, output_data);
89+
cnc_print_strn(output_written, output_data);
9090
// the stream (may be) line-buffered, so make sure an extra "\n" is written
9191
// out this is actually critical for some forms of stdout/stderr mirrors; they
9292
// won't show the last line even if you manually call fflush(…) !

examples/basic/source/registry_windows_code_page.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ int main(int argc, char* argv[]) {
203203
}
204204

205205
printf("Output conversion result:\n");
206-
cnc_print_str_c8n(output_bytes_written / sizeof(*output_data), output_data);
206+
cnc_print_str_c32n(output_bytes_written / sizeof(*output_data), output_data);
207207
printf("\nOriginal Input:\n");
208-
cnc_print_str_c8n(ztdc_c_string_array_size(input_data), input_data);
208+
cnc_print_str_c32n(ztdc_c_string_array_size(input_data), input_data);
209209
printf("\n\n");
210210

211211
cnc_conv_delete(conversion);

include/ztd/cuneicode/io.h

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,32 @@ size_t cnc_print_str_c32(const ztd_char32_t* __str) ZTD_USE(ZTD_NOEXCEPT_IF_CXX)
137137
ZTD_EXTERN_C_CLOSE_I_
138138

139139
#define cnc_fprint_strn(_FILE, _STR_SIZE, _STR) \
140-
_ZTDC_CASCADING_GENERIC(*_STR, char, cnc_fprint_str_mcn(_FILE, _STR_SIZE, _STR), ztd_wchar_t, \
141-
cnc_fprint_str_mwcn(_FILE, _STR_SIZE, _STR), ztd_char8_t, \
142-
cnc_fprint_str_c8n(_FILE, _STR_SIZE, _STR), ztd_char16_t, \
143-
cnc_fprint_str_c16n(_FILE, _STR_SIZE, _STR), ztd_char32_t, \
144-
cnc_fprint_str_c32n(_FILE, _STR_SIZE, _STR))
145-
#define cnc_fprint_str(_FILE, _STR) \
146-
_ZTDC_CASCADING_GENERIC(*_STR, char, cnc_fprint_str_mc(_FILE, _STR), ztd_wchar_t, \
147-
cnc_fprint_str_mwc(_FILE, _STR), ztd_char8_t, cnc_fprint_str_c8(_FILE, _STR), \
148-
ztd_char16_t, cnc_fprint_str_c16(_FILE, _STR), ztd_char32_t, \
149-
cnc_fprint_str_c32(_FILE, _STR))
140+
_Generic(*(_STR), \
141+
ztd_char32_t: cnc_fprint_str_c32n(_FILE, (_STR_SIZE), (const ztd_char32_t*)(_STR)), \
142+
default: _Generic(*(_STR), \
143+
ztd_char16_t: cnc_fprint_str_c16n(_FILE, (_STR_SIZE), (const ztd_char16_t*)(_STR)), \
144+
default: _Generic(*(_STR), \
145+
ztd_char8_t: cnc_fprint_str_c8n( \
146+
_FILE, (_STR_SIZE), (const ztd_char8_t*)(_STR)), \
147+
default: _Generic(*(_STR), \
148+
ztd_wchar_t: cnc_fprint_str_mwcn( \
149+
_FILE, (_STR_SIZE), (const ztd_wchar_t*)(_STR)), \
150+
default: _Generic(*(_STR), \
151+
ztd_char_t: cnc_fprint_str_mcn( \
152+
_FILE, (_STR_SIZE), (const ztd_char_t*)(_STR)), \
153+
default: 0)))))
154+
#define cnc_fprint_str(_FILE, _STR) \
155+
_Generic(*(_STR), \
156+
ztd_char32_t: cnc_fprint_str_c32(_FILE, (const ztd_char32_t*)(_STR)), \
157+
default: _Generic(*(_STR), \
158+
ztd_char16_t: cnc_fprint_str_c16(_FILE, (const ztd_char16_t*)(_STR)), \
159+
default: _Generic(*(_STR), \
160+
ztd_char8_t: cnc_fprint_str_c8(_FILE, (const ztd_char8_t*)(_STR)), \
161+
default: _Generic(*(_STR), \
162+
ztd_wchar_t: cnc_fprint_str_mwc(_FILE, (const ztd_wchar_t*)(_STR)), \
163+
default: _Generic(*(_STR), \
164+
ztd_char_t: cnc_fprint_str_mc(_FILE, (const ztd_char_t*)(_STR)), \
165+
default: 0)))))
150166
#define cnc_print_strn(...) cnc_fprint_strn(stdout, __VA_ARGS__)
151167
#define cnc_print_str(...) cnc_fprint_str(stdout, __VA_ARGS__)
152168

0 commit comments

Comments
 (0)