Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 01:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix warnings

Browse source 
- Revert to wZ, gcc is being stupid.

svn path=/trunk/; revision=16769
This commit is contained in:
Alex Ionescu 2005-07-27 01:02:51 +00:00
parent c8370e3506
commit bbd697daa6
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/subsys/system/calc/winecalc.c
View file

@ -2927,15 +2927,15 @@ void calc_buffer_display(CALC *calc) {
switch (calc->numBase) { switch (calc->numBase) {
case NBASE_HEX: case NBASE_HEX:
real = calc_atof(calc->buffer, calc->numBase); real = calc_atof(calc->buffer, calc->numBase);
sprintf(calc->display, "%x", (long)real); sprintf(calc->display, "%lx", (long)real);
break; break;
case NBASE_OCTAL: case NBASE_OCTAL:
sprintf(calc->display, "%o", calc->buffer); sprintf(calc->display, "%lo", (long)calc->buffer);
break; break;
case NBASE_BINARY: case NBASE_BINARY:
sprintf(calc->display, "%x", calc->buffer); sprintf(calc->display, "%lx", (long)calc->buffer);
break; break;
case NBASE_DECIMAL: case NBASE_DECIMAL:
@ -3060,7 +3060,7 @@ char *calc_sep(char *s)
// commify the integer part now // commify the integer part now
while (c = *(s + --n)) { while ((c = *(s + --n))) {
r[i++] = c; r[i++] = c;
if (x++ % 3 == 0) if (x++ % 3 == 0)
r[i++] = ','; r[i++] = ',';
@ -3258,7 +3258,7 @@ int parse(int wParam, int lParam)
case 'F': case 'F':
{ {
char s22[CALC_BUF_SIZE]; char s22[CALC_BUF_SIZE];
char w = (char)LOWORD(wParam); UCHAR w = (UCHAR)LOWORD(wParam);
if (!keys[calc.numBase][w]) { if (!keys[calc.numBase][w]) {
MessageBeep(0); MessageBeep(0);

4
reactos/subsys/system/usetup/partlist.c
View file

@ -918,14 +918,14 @@ PrintDiskData (PPARTLIST List,
if (DiskEntry->DriverName.Length > 0) if (DiskEntry->DriverName.Length > 0)
{ {
sprintf (LineBuffer, sprintf (LineBuffer,
"%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ",
DiskSize, DiskSize,
Unit, Unit,
DiskEntry->DiskNumber, DiskEntry->DiskNumber,
DiskEntry->Port, DiskEntry->Port,
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
DiskEntry->DriverName.Buffer); &DiskEntry->DriverName);
} }
else else
{ {