- Remove extra semicolons. Amine Khaldi, bug #3980.

- Fix a warning (bug) in ADNS library.

svn path=/trunk/; revision=39391
This commit is contained in:
Dmitry Gorbachev 2009-02-04 16:26:02 +00:00
parent 43eb75a9e4
commit 2e93c4c1d9
25 changed files with 58 additions and 58 deletions

View file

@ -61,7 +61,7 @@ struct rc4_state
void* APP_CC void* APP_CC
ssl_rc4_info_create(void) ssl_rc4_info_create(void)
{ {
return g_malloc(sizeof(struct rc4_state), 1);; return g_malloc(sizeof(struct rc4_state), 1);
} }
/*****************************************************************************/ /*****************************************************************************/

View file

@ -44,7 +44,7 @@ SendLine(SOCKET sock, LPSTR lpLine)
LogEvent(L"Chargen: unknown error\n", WSAGetLastError(), 0, LOG_ERROR); LogEvent(L"Chargen: unknown error\n", WSAGetLastError(), 0, LOG_ERROR);
} }
return bRet;; return bRet;
} }
static BOOL static BOOL

View file

@ -81,7 +81,7 @@ InstallDriver(
RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength);
wcscat(FullImagePath, ImagePath); wcscat(FullImagePath, ImagePath);
DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId);; DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId);
/* Create service key */ /* Create service key */
RtlInitUnicodeString(&StringU, Driver); RtlInitUnicodeString(&StringU, Driver);

View file

@ -3428,7 +3428,7 @@ BootLoaderPage(PINPUT_RECORD Ir)
} }
else if (Line == 14) else if (Line == 14)
{ {
return SUCCESS_PAGE;; return SUCCESS_PAGE;
} }
return BOOT_LOADER_PAGE; return BOOT_LOADER_PAGE;

View file

@ -39,7 +39,7 @@ DefaultWlxWindowProc(
else if (uMsg == WM_INITDIALOG) else if (uMsg == WM_INITDIALOG)
{ {
IdTimer = SetTimer(hwndDlg, 0, WLSession->DialogTimeout * 1000, NULL); IdTimer = SetTimer(hwndDlg, 0, WLSession->DialogTimeout * 1000, NULL);
return PreviousWindowProc(hwndDlg, uMsg, wParam, lParam);; return PreviousWindowProc(hwndDlg, uMsg, wParam, lParam);
} }
else if (uMsg == WM_NCDESTROY) else if (uMsg == WM_NCDESTROY)
{ {

View file

@ -715,7 +715,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
else else
{ {
// we have to construct ImagePath ourselves // we have to construct ImagePath ourselves
PathLength = wcslen(ServiceName)*sizeof(WCHAR) + sizeof(L"system32\\drivers\\.sys");; PathLength = wcslen(ServiceName)*sizeof(WCHAR) + sizeof(L"system32\\drivers\\.sys");
BootDriverEntry->FilePath.Length = 0; BootDriverEntry->FilePath.Length = 0;
BootDriverEntry->FilePath.MaximumLength = PathLength+sizeof(WCHAR); BootDriverEntry->FilePath.MaximumLength = PathLength+sizeof(WCHAR);
BootDriverEntry->FilePath.Buffer = MmHeapAlloc(PathLength); BootDriverEntry->FilePath.Buffer = MmHeapAlloc(PathLength);

View file

@ -2039,7 +2039,7 @@
if ( gindex ) if ( gindex )
{ {
cmap->cur_charcode = char_code;; cmap->cur_charcode = char_code;
cmap->cur_gindex = gindex; cmap->cur_gindex = gindex;
cmap->cur_group = n; cmap->cur_group = n;

View file

@ -1131,7 +1131,7 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
texelUB[GCOMP] = texelUB[GCOMP] =
texelUB[BCOMP] = 0; texelUB[BCOMP] = 0;
texelUB[ACOMP] = table[index]; texelUB[ACOMP] = table[index];
break;; break;
case GL_LUMINANCE: case GL_LUMINANCE:
texelUB[RCOMP] = texelUB[RCOMP] =
texelUB[GCOMP] = texelUB[GCOMP] =
@ -1143,25 +1143,25 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
texelUB[GCOMP] = texelUB[GCOMP] =
texelUB[BCOMP] = texelUB[BCOMP] =
texelUB[ACOMP] = table[index]; texelUB[ACOMP] = table[index];
break;; break;
case GL_LUMINANCE_ALPHA: case GL_LUMINANCE_ALPHA:
texelUB[RCOMP] = texelUB[RCOMP] =
texelUB[GCOMP] = texelUB[GCOMP] =
texelUB[BCOMP] = table[index * 2 + 0]; texelUB[BCOMP] = table[index * 2 + 0];
texelUB[ACOMP] = table[index * 2 + 1]; texelUB[ACOMP] = table[index * 2 + 1];
break;; break;
case GL_RGB: case GL_RGB:
texelUB[RCOMP] = table[index * 3 + 0]; texelUB[RCOMP] = table[index * 3 + 0];
texelUB[GCOMP] = table[index * 3 + 1]; texelUB[GCOMP] = table[index * 3 + 1];
texelUB[BCOMP] = table[index * 3 + 2]; texelUB[BCOMP] = table[index * 3 + 2];
texelUB[ACOMP] = 255; texelUB[ACOMP] = 255;
break;; break;
case GL_RGBA: case GL_RGBA:
texelUB[RCOMP] = table[index * 4 + 0]; texelUB[RCOMP] = table[index * 4 + 0];
texelUB[GCOMP] = table[index * 4 + 1]; texelUB[GCOMP] = table[index * 4 + 1];
texelUB[BCOMP] = table[index * 4 + 2]; texelUB[BCOMP] = table[index * 4 + 2];
texelUB[ACOMP] = table[index * 4 + 3]; texelUB[ACOMP] = table[index * 4 + 3];
break;; break;
default: default:
_mesa_problem(ctx, "Bad palette format in fetch_texel_ci8"); _mesa_problem(ctx, "Bad palette format in fetch_texel_ci8");
return; return;

View file

@ -171,7 +171,7 @@ static void ref_norm_transform_normalize( const GLmatrix *mat,
out[i][0] = out[i][1] = out[i][2] = 0; out[i][0] = out[i][1] = out[i][2] = 0;
} }
} else { } else {
scale = lengths[i];; scale = lengths[i];
SCALE_SCALAR_3V( out[i], scale, t ); SCALE_SCALAR_3V( out[i], scale, t );
} }

View file

@ -815,7 +815,7 @@ GetObjectA(HGDIOBJ hGdiObj, int cbSize, LPVOID lpBuffer)
DWORD dwType; DWORD dwType;
INT Result = 0; INT Result = 0;
dwType = GDI_HANDLE_GET_TYPE(hGdiObj);; dwType = GDI_HANDLE_GET_TYPE(hGdiObj);
if(dwType == GDI_OBJECT_TYPE_COLORSPACE) //Stays here, processes struct A if(dwType == GDI_OBJECT_TYPE_COLORSPACE) //Stays here, processes struct A
{ {

View file

@ -115,7 +115,7 @@ Pool::new_buffer( void )
} else { } else {
if( ! nextfree ) if( ! nextfree )
grow( ); grow( );
nextfree -= buffersize;; nextfree -= buffersize;
buffer = (void *) (curblock + nextfree); buffer = (void *) (curblock + nextfree);
} }
return buffer; return buffer;

View file

@ -845,7 +845,7 @@ dev_mgr_get_desc_completion(PURB purb, PVOID context)
PUSB_CTRL_SETUP_PACKET psetup; PUSB_CTRL_SETUP_PACKET psetup;
PHCD hcd; PHCD hcd;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (purb == NULL) if (purb == NULL)
return; return;
@ -1033,7 +1033,7 @@ dev_mgr_start_select_driver(PUSB_DEV pdev)
PUSB_EVENT pevent; PUSB_EVENT pevent;
BOOLEAN bret; BOOLEAN bret;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (pdev == NULL) if (pdev == NULL)
return FALSE; return FALSE;

View file

@ -1294,7 +1294,7 @@ hub_start_reset_port_completion(PURB purb, PVOID context)
ULONG port_idx; ULONG port_idx;
PHCD hcd; PHCD hcd;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (purb == NULL) if (purb == NULL)
return; return;
@ -1460,7 +1460,7 @@ hub_disable_port_request(PUSB_DEV pdev, UCHAR port_idx)
PUSB_CTRL_SETUP_PACKET psetup; PUSB_CTRL_SETUP_PACKET psetup;
NTSTATUS status; NTSTATUS status;
PHCD hcd; PHCD hcd;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (pdev == NULL || port_idx == 0) if (pdev == NULL || port_idx == 0)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
@ -1589,7 +1589,7 @@ hub_start_next_reset_port(PUSB_DEV_MANAGER dev_mgr, BOOLEAN from_dpc)
PUSB_CTRL_SETUP_PACKET psetup; PUSB_CTRL_SETUP_PACKET psetup;
PHCD hcd = NULL; PHCD hcd = NULL;
USE_NON_PENDING_IRQL;; USE_NON_PENDING_IRQL;
if (dev_mgr == NULL) if (dev_mgr == NULL)
return FALSE; return FALSE;
@ -1736,7 +1736,7 @@ hub_check_reset_port_status(PUSB_DEV pdev, LONG port_idx)
PUSB_CTRL_SETUP_PACKET psetup; PUSB_CTRL_SETUP_PACKET psetup;
ULONG status; ULONG status;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
//let's check whether the status change is a reset complete //let's check whether the status change is a reset complete
usb_dbg_print(DBGLVL_MAXIMUM, ("hub_check_reset_port_status(): entering...\n")); usb_dbg_print(DBGLVL_MAXIMUM, ("hub_check_reset_port_status(): entering...\n"));
@ -1870,7 +1870,7 @@ hub_reexamine_port_status_queue(PUSB_DEV hub_dev, ULONG port_idx, BOOLEAN from_d
PHUB2_EXTENSION hub_ext; PHUB2_EXTENSION hub_ext;
PUSB_DEV_MANAGER dev_mgr; PUSB_DEV_MANAGER dev_mgr;
USE_NON_PENDING_IRQL;; USE_NON_PENDING_IRQL;
if (hub_dev == NULL || port_idx == 0) if (hub_dev == NULL || port_idx == 0)
return; return;
@ -2031,7 +2031,7 @@ hub_set_cfg_completion(PURB purb, PVOID pcontext)
PUSB_INTERFACE pif; PUSB_INTERFACE pif;
BOOLEAN high_speed, multiple_tt; BOOLEAN high_speed, multiple_tt;
NTSTATUS status; NTSTATUS status;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (purb == NULL || pcontext == NULL) if (purb == NULL || pcontext == NULL)
return; return;
@ -2209,7 +2209,7 @@ hub_power_on_port(PUSB_DEV pdev, UCHAR port_idx)
PURB purb; PURB purb;
PHCD hcd; PHCD hcd;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (pdev == NULL || port_idx == 0) if (pdev == NULL || port_idx == 0)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
@ -2270,7 +2270,7 @@ hub_get_hub_desc_completion(PURB purb, PVOID pcontext)
PUSB_DRIVER pdriver; PUSB_DRIVER pdriver;
DEV_HANDLE dev_handle; DEV_HANDLE dev_handle;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (purb == NULL) if (purb == NULL)
{ {
@ -2388,7 +2388,7 @@ hub_lock_unlock_tt(PUSB_DEV pdev, UCHAR port_idx, UCHAR type, BOOLEAN lock)
PHUB2_EXTENSION dev_ext; PHUB2_EXTENSION dev_ext;
PULONG pmap = NULL; PULONG pmap = NULL;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (pdev == NULL || port_idx > 127) if (pdev == NULL || port_idx > 127)
return FALSE; return FALSE;
@ -2483,7 +2483,7 @@ hub_clear_tt_buffer(PUSB_DEV pdev, URB_HS_PIPE_CONTENT pipe_content, UCHAR port_
PHUB2_EXTENSION hub_ext; PHUB2_EXTENSION hub_ext;
PHCD hcd; PHCD hcd;
NTSTATUS status; NTSTATUS status;
USE_BASIC_NON_PENDING_IRQL;; USE_BASIC_NON_PENDING_IRQL;
if (pdev == NULL) if (pdev == NULL)
return FALSE; return FALSE;
@ -2571,7 +2571,7 @@ hub_post_clear_tt_event(PUSB_DEV pdev, BYTE port_idx, ULONG pipe)
{ {
PUSB_DEV_MANAGER dev_mgr; PUSB_DEV_MANAGER dev_mgr;
PUSB_EVENT pevent; PUSB_EVENT pevent;
USE_NON_PENDING_IRQL;; USE_NON_PENDING_IRQL;
dev_mgr = dev_mgr_from_dev(pdev); dev_mgr = dev_mgr_from_dev(pdev);
@ -2688,7 +2688,7 @@ remove_irp_from_list(PIRP_LIST irp_list,
PUSB_ENDPOINT pendp; PUSB_ENDPOINT pendp;
PHCD hcd; PHCD hcd;
USE_NON_PENDING_IRQL;; USE_NON_PENDING_IRQL;
if (irp_list == NULL || pirp == NULL) if (irp_list == NULL || pirp == NULL)
return NULL; return NULL;

View file

@ -198,7 +198,7 @@ static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *bu
} }
} else { } else {
baselocal= ntohl(base.s_addr); baselocal= ntohl(base.s_addr);
if (!baselocal & 0x080000000UL) /* class A */ if (!(baselocal & 0x080000000UL)) /* class A */
mask.s_addr= htonl(0x0ff000000UL); mask.s_addr= htonl(0x0ff000000UL);
else if ((baselocal & 0x0c0000000UL) == 0x080000000UL) else if ((baselocal & 0x0c0000000UL) == 0x080000000UL)
mask.s_addr= htonl(0x0ffff0000UL); /* class B */ mask.s_addr= htonl(0x0ffff0000UL); /* class B */

View file

@ -210,7 +210,7 @@ UBool hasCollationElements(const char *locName) {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
UResourceBundle *ColEl = NULL; UResourceBundle *ColEl = NULL;
UResourceBundle *loc = ures_open(U_ICUDATA_COLL, locName, &status);; UResourceBundle *loc = ures_open(U_ICUDATA_COLL, locName, &status);
if(U_SUCCESS(status)) { if(U_SUCCESS(status)) {
status = U_ZERO_ERROR; status = U_ZERO_ERROR;

View file

@ -438,7 +438,7 @@ static void TestGetSetDateAPI()
log_verbose("\nTesting if the function ucal_setTimeZone() works fine\n"); log_verbose("\nTesting if the function ucal_setTimeZone() works fine\n");
ucal_setMillis(caldef2, d2, &status); ucal_setMillis(caldef2, d2, &status);
if(U_FAILURE(status)){ if(U_FAILURE(status)){
log_err("Error in getMillis : %s\n", u_errorName(status));; log_err("Error in getMillis : %s\n", u_errorName(status));
} }
hour=ucal_get(caldef2, UCAL_HOUR_OF_DAY, &status); hour=ucal_get(caldef2, UCAL_HOUR_OF_DAY, &status);
@ -735,7 +735,7 @@ static void TestAddRollExtensive()
tzID=(UChar*)malloc(sizeof(UChar) * 4); tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST"); u_uastrcpy(tzID, "PST");
/*open the calendar used */ /*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);; cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
log_err("ucal_open() failed : %s\n", u_errorName(status)); log_err("ucal_open() failed : %s\n", u_errorName(status));
return; return;
@ -895,7 +895,7 @@ static void TestGetLimits()
tzID=(UChar*)malloc(sizeof(UChar) * 4); tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST"); u_uastrcpy(tzID, "PST");
/*open the calendar used */ /*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);; cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
log_err("ucal_open() for gregorian calendar failed in TestGetLimits: %s\n", u_errorName(status)); log_err("ucal_open() for gregorian calendar failed in TestGetLimits: %s\n", u_errorName(status));
return; return;
@ -995,7 +995,7 @@ static void TestDOWProgression()
tzID=(UChar*)malloc(sizeof(UChar) * 4); tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_strcpy(tzID, fgGMTID); u_strcpy(tzID, fgGMTID);
/*open the calendar used */ /*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);; cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
log_err("ucal_open failed: %s\n", u_errorName(status)); log_err("ucal_open failed: %s\n", u_errorName(status));
return; return;
@ -1071,7 +1071,7 @@ static void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn
tzID=(UChar*)malloc(sizeof(UChar) * 4); tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_strcpy(tzID, fgGMTID); u_strcpy(tzID, fgGMTID);
gmtcal=ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);; gmtcal=ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
log_err("ucal_open failed: %s\n", u_errorName(status)); log_err("ucal_open failed: %s\n", u_errorName(status));
return; return;

View file

@ -416,7 +416,7 @@ free(result);
pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), NULL, NULL,&status); pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), NULL, NULL,&status);
if(U_FAILURE(status)) if(U_FAILURE(status))
{ {
log_err("error in unum_openPattern(): %s\n", myErrorName(status) );; log_err("error in unum_openPattern(): %s\n", myErrorName(status) );
} }
else else
log_verbose("Pass: unum_openPattern() works fine\n"); log_verbose("Pass: unum_openPattern() works fine\n");
@ -823,7 +823,7 @@ static void TestNumberFormatPadding()
pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), NULL, NULL,&status); pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), NULL, NULL,&status);
if(U_SUCCESS(status)) if(U_SUCCESS(status))
{ {
log_err("error in unum_openPattern(%s): %s\n", temp1, myErrorName(status) );; log_err("error in unum_openPattern(%s): %s\n", temp1, myErrorName(status) );
} }
else else
{ {
@ -836,7 +836,7 @@ static void TestNumberFormatPadding()
pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), "en_US",NULL, &status); pattern=unum_open(UNUM_IGNORE,temp1, u_strlen(temp1), "en_US",NULL, &status);
if(U_FAILURE(status)) if(U_FAILURE(status))
{ {
log_err("error in padding unum_openPattern(%s): %s\n", temp1, myErrorName(status) );; log_err("error in padding unum_openPattern(%s): %s\n", temp1, myErrorName(status) );
} }
else { else {
log_verbose("Pass: padding unum_openPattern() works fine\n"); log_verbose("Pass: padding unum_openPattern() works fine\n");

View file

@ -527,7 +527,7 @@ TestOpenDirect(void) {
} }
ures_close(idna_rules); ures_close(idna_rules);
errorCode = U_USING_FALLBACK_WARNING;; errorCode = U_USING_FALLBACK_WARNING;
idna_rules=ures_openDirect("testdata", "idna_rules", &errorCode); idna_rules=ures_openDirect("testdata", "idna_rules", &errorCode);
if(U_FAILURE(errorCode)) { if(U_FAILURE(errorCode)) {
log_err("ures_openDirect(\"idna_rules\") failed when U_USING_FALLBACK_WARNING was set prior to call: %s\n", u_errorName(errorCode)); log_err("ures_openDirect(\"idna_rules\") failed when U_USING_FALLBACK_WARNING was set prior to call: %s\n", u_errorName(errorCode));

View file

@ -115,10 +115,10 @@ static void TestAPI(void)
log_err("FAIL: T_CString_stricmp() where the second string is null failed. Expected: 1, returned %d\n", intValue); log_err("FAIL: T_CString_stricmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
} }
if((intValue=T_CString_stricmp(NULL, NULL)) != 0){ if((intValue=T_CString_stricmp(NULL, NULL)) != 0){
log_err("FAIL: T_CString_stricmp(NULL, NULL) failed. Expected: 0, returned %d\n", intValue);; log_err("FAIL: T_CString_stricmp(NULL, NULL) failed. Expected: 0, returned %d\n", intValue);
} }
if((intValue=T_CString_stricmp("", "")) != 0){ if((intValue=T_CString_stricmp("", "")) != 0){
log_err("FAIL: T_CString_stricmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);; log_err("FAIL: T_CString_stricmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);
} }
if((intValue=T_CString_stricmp("", "abc")) != -1){ if((intValue=T_CString_stricmp("", "abc")) != -1){
log_err("FAIL: T_CString_stricmp(\"\", \"abc\") failed. Expected: -1, returned %d\n", intValue); log_err("FAIL: T_CString_stricmp(\"\", \"abc\") failed. Expected: -1, returned %d\n", intValue);
@ -144,10 +144,10 @@ static void TestAPI(void)
log_err("FAIL: T_CString_strnicmp() where the second string is null failed. Expected: 1, returned %d\n", intValue); log_err("FAIL: T_CString_strnicmp() where the second string is null failed. Expected: 1, returned %d\n", intValue);
} }
if((intValue=T_CString_strnicmp(NULL, NULL, 10)) != 0){ if((intValue=T_CString_strnicmp(NULL, NULL, 10)) != 0){
log_err("FAIL: T_CString_strnicmp(NULL, NULL, 10) failed. Expected: 0, returned %d\n", intValue);; log_err("FAIL: T_CString_strnicmp(NULL, NULL, 10) failed. Expected: 0, returned %d\n", intValue);
} }
if((intValue=T_CString_strnicmp("", "", 10)) != 0){ if((intValue=T_CString_strnicmp("", "", 10)) != 0){
log_err("FAIL: T_CString_strnicmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);; log_err("FAIL: T_CString_strnicmp(\"\", \"\") failed. Expected: 0, returned %d\n", intValue);
} }
if((intValue=T_CString_strnicmp("", "abc", 10)) != -1){ if((intValue=T_CString_strnicmp("", "abc", 10)) != -1){
log_err("FAIL: T_CString_stricmp(\"\", \"abc\", 10) failed. Expected: -1, returned %d\n", intValue); log_err("FAIL: T_CString_stricmp(\"\", \"abc\", 10) failed. Expected: -1, returned %d\n", intValue);

View file

@ -910,7 +910,7 @@ static void TestSkip(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1), if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8", expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8",
UCNV_TO_U_CALLBACK_SKIP, offsets1, NULL, 0 )) UCNV_TO_U_CALLBACK_SKIP, offsets1, NULL, 0 ))
log_err("utf8->u with skip did not match.\n");; log_err("utf8->u with skip did not match.\n");
} }
log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_SKIP \n"); log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_SKIP \n");
@ -1326,7 +1326,7 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1), if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8", expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8",
UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 )) UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 ))
log_err("utf8->u with stop did not match.\n");; log_err("utf8->u with stop did not match.\n");
} }
log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_STOP \n"); log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_STOP \n");
{ {
@ -1337,7 +1337,7 @@ static void TestStop(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1), if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"SCSU", expected1, sizeof(expected1)/sizeof(expected1[0]),"SCSU",
UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 )) UCNV_TO_U_CALLBACK_STOP, offsets1, NULL, 0 ))
log_err("scsu->u with stop did not match.\n");; log_err("scsu->u with stop did not match.\n");
} }
} }
@ -1616,7 +1616,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1), if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8", expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 )) UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 ))
log_err("utf8->u with substitute did not match.\n");; log_err("utf8->u with substitute did not match.\n");
} }
log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_SUBSTITUTE \n"); log_verbose("Testing toUnicode for SCSU with UCNV_TO_U_CALLBACK_SUBSTITUTE \n");
{ {
@ -1627,7 +1627,7 @@ static void TestSub(int32_t inputsize, int32_t outputsize)
if(!testConvertToUnicode(sampleText1, sizeof(sampleText1), if(!testConvertToUnicode(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"SCSU", expected1, sizeof(expected1)/sizeof(expected1[0]),"SCSU",
UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 )) UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1, NULL, 0 ))
log_err("scsu->u with stop did not match.\n");; log_err("scsu->u with stop did not match.\n");
} }
#if !UCONFIG_NO_LEGACY_CONVERSION #if !UCONFIG_NO_LEGACY_CONVERSION

View file

@ -962,7 +962,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){
if(!testConvertToU(sampleText1, sizeof(sampleText1), if(!testConvertToU(sampleText1, sizeof(sampleText1),
expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8", UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1,FALSE)) expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8", UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1,FALSE))
log_err("utf8->u with substitute did not match.\n");; log_err("utf8->u with substitute did not match.\n");
} }
#if !UCONFIG_NO_LEGACY_CONVERSION #if !UCONFIG_NO_LEGACY_CONVERSION

View file

@ -3905,7 +3905,7 @@ xmlTextReaderPreserve(xmlTextReaderPtr reader) {
} }
reader->preserves++; reader->preserves++;
parent = cur->parent;; parent = cur->parent;
while (parent != NULL) { while (parent != NULL) {
if (parent->type == XML_ELEMENT_NODE) if (parent->type == XML_ELEMENT_NODE)
parent->extra |= NODE_IS_PRESERVED; parent->extra |= NODE_IS_PRESERVED;

View file

@ -20087,7 +20087,7 @@ xmlSchemaResolveAttrUseReferences(xmlSchemaAttributeUsePtr ause,
WXS_BASIC_CAST ause, ause->node, WXS_BASIC_CAST ause, ause->node,
"ref", ref->name, ref->targetNamespace, "ref", ref->name, ref->targetNamespace,
XML_SCHEMA_TYPE_ATTRIBUTE, NULL); XML_SCHEMA_TYPE_ATTRIBUTE, NULL);
return(ctxt->err);; return(ctxt->err);
} }
} }
return(0); return(0);
@ -28596,7 +28596,7 @@ xmlSchemaValidateStream(xmlSchemaValidCtxtPtr ctxt,
#endif #endif
pctxt->linenumbers = 1; pctxt->linenumbers = 1;
inputStream = xmlNewIOInputStream(pctxt, input, enc);; inputStream = xmlNewIOInputStream(pctxt, input, enc);
if (inputStream == NULL) { if (inputStream == NULL) {
ret = -1; ret = -1;
goto done; goto done;

View file

@ -24,7 +24,7 @@
KD_PORT_INFORMATION PortInfo = {DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0}; KD_PORT_INFORMATION PortInfo = {DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0};
ULONG KdpPortIrq; ULONG KdpPortIrq;
#ifdef AUTO_ENABLE_BOCHS #ifdef AUTO_ENABLE_BOCHS
KDP_DEBUG_MODE KdpDebugMode = {{{.Bochs=TRUE}}};; KDP_DEBUG_MODE KdpDebugMode = {{{.Bochs=TRUE}}};
#else #else
KDP_DEBUG_MODE KdpDebugMode; KDP_DEBUG_MODE KdpDebugMode;
#endif #endif

View file

@ -2782,7 +2782,7 @@ yyreduce:
case 81: case 81:
#line 876 "parser.y" #line 876 "parser.y"
{ (yyval.ctl)=ins_ctrl(CT_BUTTON, BS_GROUPBOX, (yyvsp[0].ctl), (yyvsp[-2].ctl));;} { (yyval.ctl)=ins_ctrl(CT_BUTTON, BS_GROUPBOX, (yyvsp[0].ctl), (yyvsp[-2].ctl));}
break; break;
case 82: case 82:
@ -2982,7 +2982,7 @@ yyreduce:
case 104: case 104:
#line 1008 "parser.y" #line 1008 "parser.y"
{ (yyval.style) = new_style((yyvsp[-2].style)->or_mask | (yyvsp[0].style)->or_mask, (yyvsp[-2].style)->and_mask | (yyvsp[0].style)->and_mask); free((yyvsp[-2].style)); free((yyvsp[0].style));;} { (yyval.style) = new_style((yyvsp[-2].style)->or_mask | (yyvsp[0].style)->or_mask, (yyvsp[-2].style)->and_mask | (yyvsp[0].style)->and_mask); free((yyvsp[-2].style)); free((yyvsp[0].style));}
break; break;
case 105: case 105:
@ -3159,7 +3159,7 @@ yyreduce:
case 130: case 130:
#line 1093 "parser.y" #line 1093 "parser.y"
{ (yyval.ctl)=ins_ctrl(CT_BUTTON, BS_GROUPBOX, (yyvsp[0].ctl), (yyvsp[-2].ctl));;} { (yyval.ctl)=ins_ctrl(CT_BUTTON, BS_GROUPBOX, (yyvsp[0].ctl), (yyvsp[-2].ctl));}
break; break;
case 131: case 131:
@ -3381,7 +3381,7 @@ yyreduce:
case 154: case 154:
#line 1253 "parser.y" #line 1253 "parser.y"
{(yyval.menitm) = NULL;;} {(yyval.menitm) = NULL;}
break; break;
case 155: case 155: