eryn/polka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up the build -- all the build errors

Browse source
This commit is contained in:
Eryn Wells 2016-03-29 12:07:10 -04:00
parent 8411502db5
commit 75af75af4e
6 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kstd/PrintFormat.cc
View file

@ -197,6 +197,8 @@ printFormat(const char* format,
Size
} state = Default;
auto& cons = kernel::Kernel::systemKernel().console();
int nchars = 0;
Spec spec;
@ -207,14 +209,14 @@ printFormat(const char* format,
state = Percent;
spec.clear();
} else {
printChar(*p);
cons.printChar(*p);
nchars++;
}
break;
case Percent:
if (*p == '%') {
state = Default;
printChar(*p);
cons.printChar(*p);
nchars++;
} else if (Char::isDigit(*p)) {
if (*p == '0' && !spec.zeroPadded) {
@ -247,7 +249,7 @@ printFormat(const char* format,
}
break;
default:
printChar(*p);
cons.printChar(*p);
nchars++;
break;
}
@ -317,7 +319,7 @@ printFormat(const char* format,
spec.type = Spec::Type::String;
break;
}
nchars += spec.print(kernel::systemKernel().console());
nchars += spec.print(cons);
continue;
}

4
src/kstd/PrintFormat.hh
View file

@ -15,8 +15,8 @@ namespace kstd {
* @return Number of characters printed
* @{
*/
int printFormat(const char* format, ...) PRINTF(2,3);
int printFormat(const char* format, ...) PRINTF(1,2);
int printFormat(const char* format, va_list args);
/** @} */
} /* namespace kstd */