cleanup patch
Andreas Mohr
a.mohr at mailto.de
Wed Sep 19 07:08:21 CDT 2001
Hi all,
- rename "SystemTime" to "t" (this is *not* SYSTEMTIME - avoid confusion)
- alignment fixes
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at rhlx01.fht-esslingen.de:/home/wine
Index: dlls/wininet/utility.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/utility.c,v
retrieving revision 1.5
diff -u -r1.5 utility.c
--- dlls/wininet/utility.c 24 Aug 2001 19:13:36 -0000 1.5
+++ dlls/wininet/utility.c 19 Sep 2001 10:06:44 -0000
@@ -29,7 +29,7 @@
{
char tmpChar[TIME_STRING_LEN];
char *tmpChar2;
- struct tm SystemTime;
+ struct tm t;
int timelen = strlen(asctime);
if(!asctime || !timelen)
@@ -56,11 +56,11 @@
tmpChar[22]='\0';
tmpChar[25]='\0';
- SystemTime.tm_year = atoi(tmpChar+12) - 1900;
- SystemTime.tm_mday = atoi(tmpChar+5);
- SystemTime.tm_hour = atoi(tmpChar+17);
- SystemTime.tm_min = atoi(tmpChar+20);
- SystemTime.tm_sec = atoi(tmpChar+23);
+ t.tm_year = atoi(tmpChar+12) - 1900;
+ t.tm_mday = atoi(tmpChar+5);
+ t.tm_hour = atoi(tmpChar+17);
+ t.tm_min = atoi(tmpChar+20);
+ t.tm_sec = atoi(tmpChar+23);
/* and month */
tmpChar2 = tmpChar + 8;
@@ -68,45 +68,45 @@
{
case 'n':
if(tmpChar2[1]=='a')
- SystemTime.tm_mon = 0;
+ t.tm_mon = 0;
else
- SystemTime.tm_mon = 5;
+ t.tm_mon = 5;
break;
case 'b':
- SystemTime.tm_mon = 1;
+ t.tm_mon = 1;
break;
case 'r':
if(tmpChar2[1]=='a')
- SystemTime.tm_mon = 2;
+ t.tm_mon = 2;
else
- SystemTime.tm_mon = 3;
+ t.tm_mon = 3;
break;
case 'y':
- SystemTime.tm_mon = 4;
+ t.tm_mon = 4;
break;
case 'l':
- SystemTime.tm_mon = 6;
+ t.tm_mon = 6;
break;
case 'g':
- SystemTime.tm_mon = 7;
+ t.tm_mon = 7;
break;
case 'p':
- SystemTime.tm_mon = 8;
+ t.tm_mon = 8;
break;
case 't':
- SystemTime.tm_mon = 9;
+ t.tm_mon = 9;
break;
case 'v':
- SystemTime.tm_mon = 10;
+ t.tm_mon = 10;
break;
case 'c':
- SystemTime.tm_mon = 11;
+ t.tm_mon = 11;
break;
default:
FIXME("\n");
}
- return mktime(&SystemTime);
+ return mktime(&t);
}
Index: msdos/int25.c
===================================================================
RCS file: /home/wine/wine/msdos/int25.c,v
retrieving revision 1.12
diff -u -r1.12 int25.c
--- msdos/int25.c 20 Jun 2001 23:03:18 -0000 1.12
+++ msdos/int25.c 19 Sep 2001 10:06:44 -0000
@@ -47,7 +47,7 @@
"count %ld, buffer %p\n",
LOBYTE(context->Eax), begin, length, dataptr);
- DRIVE_RawRead(LOBYTE(context->Eax), begin, length, dataptr, TRUE);
+ DRIVE_RawRead(LOBYTE(context->Eax), begin, length, dataptr, TRUE);
RESET_CFLAG(context);
}
Index: msdos/int26.c
===================================================================
RCS file: /home/wine/wine/msdos/int26.c,v
retrieving revision 1.11
diff -u -r1.11 int26.c
--- msdos/int26.c 20 Jun 2001 23:03:18 -0000 1.11
+++ msdos/int26.c 19 Sep 2001 10:06:44 -0000
@@ -46,6 +46,6 @@
"count %ld, buffer %p\n",
AL_reg(context), begin, length, dataptr );
- DRIVE_RawWrite(LOBYTE(context->Eax), begin, length, dataptr, TRUE);
+ DRIVE_RawWrite(LOBYTE(context->Eax), begin, length, dataptr, TRUE);
RESET_CFLAG(context);
}
Index: windows/win.c
===================================================================
RCS file: /home/wine/wine/windows/win.c,v
retrieving revision 1.151
diff -u -r1.151 win.c
--- windows/win.c 14 Sep 2001 00:24:40 -0000 1.151
+++ windows/win.c 19 Sep 2001 10:06:45 -0000
@@ -239,9 +239,9 @@
{
if(!initWndPtr) return 0;
- /* Lock all WND structures for thread safeness*/
+ /* Lock all WND structures for thread safeness */
USER_Lock();
- /*and increment destruction monitoring*/
+ /* and increment destruction monitoring */
initWndPtr->irefCount++;
return initWndPtr;
@@ -257,9 +257,9 @@
{
if(!wndPtr) return;
- /*Decrement destruction monitoring value*/
+ /* Decrement destruction monitoring value */
wndPtr->irefCount--;
- /* Check if it's time to release the memory*/
+ /* Check if it's time to release the memory */
if(wndPtr->irefCount == 0 && !wndPtr->dwMagic)
{
/* Release memory */
@@ -270,7 +270,7 @@
/* This else if is useful to monitor the WIN_ReleaseWndPtr function */
ERR("forgot a Lock on %p somewhere\n",wndPtr);
}
- /*unlock all WND structures for thread safeness*/
+ /* unlock all WND structures for thread safeness */
USER_Unlock();
}
More information about the wine-patches
mailing list