djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #412 from dhylands/pfenv-strn-stack

Browse Source 
Pfenv strn stack
This commit is contained in:
Damien George 2014-04-01 20:55:27 +01:00
commit e8e8f212aa
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
py/pfenv.c
View File

@ -16,9 +16,8 @@
#include "formatfloat.h"
#endif
#define PF_PAD_SIZE 16
static const char *pad_spaces = " ";
static const char *pad_zeroes = "0000000000000000";
static const char pad_spaces[] = " ";
static const char pad_zeroes[] = "0000000000000000";
void pfenv_vstr_add_strn(void *data, const char *str, unsigned int len){
vstr_add_strn(data, str, len);
@ -28,16 +27,20 @@ int pfenv_print_strn(const pfenv_t *pfenv, const char *str, unsigned int len, in
int left_pad = 0;
int right_pad = 0;
int pad = width - len;
char pad_fill[PF_PAD_SIZE];
int pad_size;
const char *pad_chars;
if (!fill || fill == ' ' ) {
pad_chars = pad_spaces;
pad_size = sizeof(pad_spaces) - 1;
} else if (fill == '0') {
pad_chars = pad_zeroes;
pad_size = sizeof(pad_zeroes) - 1;
} else {
memset(pad_fill, fill, PF_PAD_SIZE);
pad_chars = pad_fill;
// Other pad characters are fairly unusual, so we'll take the hit
// and output them 1 at a time.
pad_chars = &fill;
pad_size = 1;
}
if (flags & PF_FLAG_CENTER_ADJUST) {
@ -52,8 +55,8 @@ int pfenv_print_strn(const pfenv_t *pfenv, const char *str, unsigned int len, in
if (left_pad) {
while (left_pad > 0) {
int p = left_pad;
if (p > PF_PAD_SIZE)
p = PF_PAD_SIZE;
if (p > pad_size)
p = pad_size;
pfenv->print_strn(pfenv->data, pad_chars, p);
left_pad -= p;
}
@ -62,8 +65,8 @@ int pfenv_print_strn(const pfenv_t *pfenv, const char *str, unsigned int len, in
if (right_pad) {
while (right_pad > 0) {
int p = right_pad;
if (p > PF_PAD_SIZE)
p = PF_PAD_SIZE;
if (p > pad_size)
p = pad_size;
pfenv->print_strn(pfenv->data, pad_chars, p);
right_pad -= p;
}