Skip to content

Rename compressed_string_t to mp_rom_error_text_t to match upstream #8519

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 7 commits into from
Oct 27, 2023
Merged

Rename compressed_string_t to mp_rom_error_text_t to match upstream #8519

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55874b6
Rename compressed_string_t to mp_rom_error_text_t to match upstream
jepler Oct 25, 2023
acf350a
In py/ use MP_ERROR_TEXT instead of translate
jepler Oct 25, 2023
54a5878
WIP
jepler Oct 25, 2023
de541cf
Fix pointer-ness, const-ness of compressed messages
jepler Oct 25, 2023
a069dc9
restore cprintf/vcprintf prototypes
jepler Oct 26, 2023
c695f8b
remove some unneeded diffs
jepler Oct 26, 2023
3f1b9af
py/mpprint.c: fix formatting
dhalbert Oct 26, 2023
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
Prev Previous commit
Next Next commit
restore cprintf/vcprintf prototypes
  • Loading branch information
@jepler
jepler committed Oct 26, 2023
commit a069dc92e06f515d72c92e494e92e39f9a45cb26
6 changes: 4 additions & 2 deletions py/mpprint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ int mp_printf(const mp_print_t *print, const char *fmt, ...);
int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args);
#endif

int mp_cprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, ...);
// CIRCUITPY-CHANGE
struct compressed_string;
int mp_cprintf(const mp_print_t *print, const struct compressed_string *compressed_fmt, ...);
#ifdef va_start
int mp_vcprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, va_list args);
int mp_vcprintf(const mp_print_t *print, const struct compressed_string *compressed_fmt, va_list args);
#endif

#endif // MICROPY_INCLUDED_PY_MPPRINT_H