[OpenAFS-devel] [PATCH] flexelint: aggregate initialization patches
Joe Buehler
jbuehler@hekimian.com
Fri, 21 Nov 2003 14:15:42 -0500
This is a multi-part message in MIME format.
--------------080801070500000905080307
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
This patch mainly makes explicit some initializations that were implicit.
There are several places where it looks like the missing initialization
may be a bug, and I have inserted comments to that effect in the
relevant patches. Someone needs to look at them and supply
whatever is missing (if anything is).
In make_keyperm.c, an array was sized too large.
--
Joe Buehler
--------------080801070500000905080307
Content-Type: text/plain;
name="temp.patch.aggregate-initialization"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="temp.patch.aggregate-initialization"
--- ./src/WINNT/afsapplib/al_cover.cpp.~1~ 2000-11-04 05:01:19.000000000 -0500
+++ ./src/WINNT/afsapplib/al_cover.cpp 2003-11-20 15:35:50.000000000 -0500
@@ -21,10 +21,10 @@
*/
rwWindowData awdCover[] = {
- { IDC_COVER_BORDER, raSizeX | raSizeY },
- { IDC_COVER_DESC, raSizeX | raSizeY | raRepaint },
- { IDC_COVER_BUTTON, raMoveX | raMoveY | raRepaint },
- { idENDLIST, 0 }
+ { IDC_COVER_BORDER, raSizeX | raSizeY, 0, 0 },
+ { IDC_COVER_DESC, raSizeX | raSizeY | raRepaint, 0, 0 },
+ { IDC_COVER_BUTTON, raMoveX | raMoveY | raRepaint, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
#define WS_EX_HIDDENBYCOVER 0x10000000L
--- ./src/WINNT/afssvrcfg/create_partition_dlg.cpp.~1~ 2000-11-04 05:01:51.000000000 -0500
+++ ./src/WINNT/afssvrcfg/create_partition_dlg.cpp 2003-11-20 15:50:34.000000000 -0500
@@ -40,16 +40,16 @@
static TCHAR szSize[32];
static rwWindowData arwDialog[] = {
- { IDC_TITLE, raSizeX | raRepaint },
- { IDC_DRIVE_LIST, raSizeX | raSizeY, MAKELONG(350, 150) },
- { IDC_ARGS_FRAME, raSizeX | raMoveY },
- { IDC_NAME_STATIC, raMoveY | raRepaint },
- { IDC_VICEP_STATIC, raMoveY | raRepaint },
- { IDC_PARTITION_NAME, raMoveY | raRepaint },
- { IDC_CREATE, raMoveX | raMoveY },
- { IDC_CLOSE, raMoveX | raMoveY },
- { 9, raMoveX | raMoveY },
- { idENDLIST, 0 }
+ { IDC_TITLE, raSizeX | raRepaint, 0, 0 },
+ { IDC_DRIVE_LIST, raSizeX | raSizeY, MAKELONG(350, 150), 0 },
+ { IDC_ARGS_FRAME, raSizeX | raMoveY, 0, 0 },
+ { IDC_NAME_STATIC, raMoveY | raRepaint, 0, 0 },
+ { IDC_VICEP_STATIC, raMoveY | raRepaint, 0, 0 },
+ { IDC_PARTITION_NAME, raMoveY | raRepaint, 0, 0 },
+ { IDC_CREATE, raMoveX | raMoveY, 0, 0 },
+ { IDC_CLOSE, raMoveX | raMoveY, 0, 0 },
+ { 9, raMoveX | raMoveY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrcfg/salvage_results_dlg.cpp.~1~ 2000-11-04 05:01:54.000000000 -0500
+++ ./src/WINNT/afssvrcfg/salvage_results_dlg.cpp 2003-11-20 15:51:16.000000000 -0500
@@ -29,10 +29,10 @@
static const char *SALVAGE_LOG_FILE_NAME = "SalvageLog.txt";
static rwWindowData arwDialog[] = {
- { IDC_LOG, raSizeX | raSizeY, MAKELONG(350, 150) },
- { IDC_CLOSE, raMoveX | raMoveY },
- { 9, raMoveX | raMoveY },
- { idENDLIST, 0 }
+ { IDC_LOG, raSizeX | raSizeY, MAKELONG(350, 150), 0 },
+ { IDC_CLOSE, raMoveX | raMoveY, 0, 0 },
+ { 9, raMoveX | raMoveY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/action.cpp.~1~ 2000-11-04 05:02:00.000000000 -0500
+++ ./src/WINNT/afssvrmgr/action.cpp 2003-11-19 14:35:37.000000000 -0500
@@ -118,9 +118,9 @@
} l;
rwWindowData awdActions[] = {
- { IDC_ACTION_DESC, raSizeX | raRepaint },
- { IDC_ACTION_LIST, raSizeX | raSizeY, MAKELONG(cxMIN_ACTION,cyMIN_ACTION) },
- { idENDLIST, 0 }
+ { IDC_ACTION_DESC, raSizeX | raRepaint, 0, 0 },
+ { IDC_ACTION_LIST, raSizeX | raSizeY, MAKELONG(cxMIN_ACTION,cyMIN_ACTION), 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/agg_tab.cpp.~1~ 2000-11-04 05:02:01.000000000 -0500
+++ ./src/WINNT/afssvrmgr/agg_tab.cpp 2003-11-19 15:01:36.000000000 -0500
@@ -27,10 +27,10 @@
*/
rwWindowData awdAggregates[] = {
- { IDC_AGG_DESC, raSizeX },
- { IDC_AGG_LIST, raSizeX | raSizeY },
- { IDC_AGG_CREATESET, raMoveX | raMoveY },
- { idENDLIST, 0 }
+ { IDC_AGG_DESC, raSizeX, 0, 0 },
+ { IDC_AGG_LIST, raSizeX | raSizeY, 0, 0 },
+ { IDC_AGG_CREATESET, raMoveX | raMoveY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/cmdline.cpp.~1~ 2002-04-01 11:25:37.000000000 -0500
+++ ./src/WINNT/afssvrmgr/cmdline.cpp 2003-11-19 15:19:14.000000000 -0500
@@ -43,15 +43,15 @@
BOOL fPresent;
TCHAR szValue[ cchRESOURCE ];
} aSWITCHES[] = {
- { TEXT("cell"), TRUE },
- { TEXT("subset"), TRUE },
- { TEXT("server"), TRUE },
- { TEXT("reset"), FALSE },
- { TEXT("confirm"), FALSE },
- { TEXT("user"), TRUE },
- { TEXT("password"), TRUE },
- { TEXT("lookup"), FALSE },
- { TEXT("useexisting"), FALSE }
+ { TEXT("cell"), TRUE, FALSE, TEXT("") },
+ { TEXT("subset"), TRUE, FALSE, TEXT("") },
+ { TEXT("server"), TRUE, FALSE, TEXT("") },
+ { TEXT("reset"), FALSE, FALSE, TEXT("") },
+ { TEXT("confirm"), FALSE, FALSE, TEXT("") },
+ { TEXT("user"), TRUE, FALSE, TEXT("") },
+ { TEXT("password"), TRUE, FALSE, TEXT("") },
+ { TEXT("lookup"), FALSE, FALSE, TEXT("") },
+ { TEXT("useexisting"), FALSE, FALSE, TEXT("") }
};
#define nSWITCHES (sizeof(aSWITCHES) / sizeof(aSWITCHES[0]))
--- ./src/WINNT/afssvrmgr/columns.cpp.~1~ 2000-11-04 05:02:02.000000000 -0500
+++ ./src/WINNT/afssvrmgr/columns.cpp 2003-11-19 15:29:08.000000000 -0500
@@ -62,14 +62,14 @@
}
COLUMNS[] =
{
- { IDS_COL_SERVERS, FALSE }, // ceSERVERS
- { IDS_COL_FILESETS, FALSE }, // ceFILESETS
- { IDS_COL_AGGREGATES, FALSE }, // ceAGGREGATES
- { IDS_COL_SERVICES, FALSE }, // ceSERVICES
- { IDS_COL_REPLICAS, FALSE }, // ceREPLICAS
- { IDS_COL_AGGS_MOVE, TRUE }, // ceAGG_MOVE
- { IDS_COL_AGGS_CREATE, TRUE }, // ceAGG_CREATE
- { IDS_COL_AGGS_RESTORE, TRUE } // ceAGG_RESTORE
+ { IDS_COL_SERVERS, FALSE, {0}, FALSE }, // ceSERVERS
+ { IDS_COL_FILESETS, FALSE, {0}, FALSE }, // ceFILESETS
+ { IDS_COL_AGGREGATES, FALSE, {0}, FALSE }, // ceAGGREGATES
+ { IDS_COL_SERVICES, FALSE, {0}, FALSE }, // ceSERVICES
+ { IDS_COL_REPLICAS, FALSE, {0}, FALSE }, // ceREPLICAS
+ { IDS_COL_AGGS_MOVE, TRUE, {0}, FALSE }, // ceAGG_MOVE
+ { IDS_COL_AGGS_CREATE, TRUE, {0}, FALSE }, // ceAGG_CREATE
+ { IDS_COL_AGGS_RESTORE, TRUE, {0}, FALSE } // ceAGG_RESTORE
};
#define nCOLUMNS (sizeof(COLUMNS)/sizeof(COLUMNS[0]))
--- ./src/WINNT/afssvrmgr/set_tab.cpp.~1~ 2000-11-04 05:02:09.000000000 -0500
+++ ./src/WINNT/afssvrmgr/set_tab.cpp 2003-11-20 16:29:11.000000000 -0500
@@ -34,13 +34,13 @@
*/
rwWindowData awdFilesets[] = {
- { IDC_SET_DESC, raSizeX },
- { IDC_SET_LIST, raSizeX | raSizeY },
- { IDC_SET_CREATE, raMoveX | raMoveY },
- { IDC_SET_DELETE, raMoveX | raMoveY },
- { IDC_SET_REP, raMoveX | raMoveY },
- { IDC_SET_SETQUOTA, raMoveX | raMoveY },
- { idENDLIST, 0 }
+ { IDC_SET_DESC, raSizeX, 0, 0 },
+ { IDC_SET_LIST, raSizeX | raSizeY, 0, 0 },
+ { IDC_SET_CREATE, raMoveX | raMoveY, 0, 0 },
+ { IDC_SET_DELETE, raMoveX | raMoveY, 0, 0 },
+ { IDC_SET_REP, raMoveX | raMoveY, 0, 0 },
+ { IDC_SET_SETQUOTA, raMoveX | raMoveY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/svc_tab.cpp.~1~ 2000-11-04 05:02:11.000000000 -0500
+++ ./src/WINNT/afssvrmgr/svc_tab.cpp 2003-11-20 16:33:09.000000000 -0500
@@ -26,12 +26,12 @@
*/
rwWindowData awdServices[] = {
- { IDC_SVC_DESC, raSizeX },
- { IDC_SVC_LIST, raSizeX | raSizeY },
- { IDC_SVC_CREATE, raMoveX | raMoveY },
- { IDC_SVC_DELETE, raMoveX | raMoveY },
- { IDC_SVC_RESTART, raMoveX | raMoveY },
- { idENDLIST, 0 }
+ { IDC_SVC_DESC, raSizeX, 0, 0 },
+ { IDC_SVC_LIST, raSizeX | raSizeY, 0, 0 },
+ { IDC_SVC_CREATE, raMoveX | raMoveY, 0, 0 },
+ { IDC_SVC_DELETE, raMoveX | raMoveY, 0, 0 },
+ { IDC_SVC_RESTART, raMoveX | raMoveY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/svc_viewlog.cpp.~1~ 2000-11-04 05:02:12.000000000 -0500
+++ ./src/WINNT/afssvrmgr/svc_viewlog.cpp 2003-11-20 15:44:37.000000000 -0500
@@ -30,13 +30,13 @@
*/
rwWindowData awdShowLog[] = {
- { IDC_SVC_VIEWLOG_DESC, raSizeX | raRepaint },
- { IDC_SVC_VIEWLOG_FILENAME, raSizeX | raRepaint },
- { IDC_VIEWLOG_TEXT, raSizeX | raSizeY | raRepaint, MAKELONG(cxMIN_VIEWLOG,cyMIN_VIEWLOG) },
- { IDC_SVC_VIEWLOG_CONTENTS, raSizeX },
- { IDOK, raMoveX | raMoveY },
- { IDC_VIEWLOG_SAVEAS, raMoveX | raMoveY },
- { idENDLIST, 0 }
+ { IDC_SVC_VIEWLOG_DESC, raSizeX | raRepaint, 0, 0 },
+ { IDC_SVC_VIEWLOG_FILENAME, raSizeX | raRepaint, 0, 0 },
+ { IDC_VIEWLOG_TEXT, raSizeX | raSizeY | raRepaint, MAKELONG(cxMIN_VIEWLOG,cyMIN_VIEWLOG), 0 },
+ { IDC_SVC_VIEWLOG_CONTENTS, raSizeX, 0, 0 },
+ { IDOK, raMoveX | raMoveY, 0, 0 },
+ { IDC_VIEWLOG_SAVEAS, raMoveX | raMoveY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/svr_salvage.cpp.~1~ 2000-11-04 05:02:14.000000000 -0500
+++ ./src/WINNT/afssvrmgr/svr_salvage.cpp 2003-11-20 15:44:17.000000000 -0500
@@ -32,10 +32,10 @@
*/
rwWindowData awdSalvageResults[] = {
- { IDC_SALVAGE_TITLE, raSizeX | raRepaint },
- { IDC_SALVAGE_DETAILS, raSizeX | raSizeY | raRepaint, MAKELONG(cxMIN_SALVAGE_R,cyMIN_SALVAGE_R) },
- { IDOK, raMoveX | raMoveY },
- { idENDLIST, 0 }
+ { IDC_SALVAGE_TITLE, raSizeX | raRepaint, 0, 0 },
+ { IDC_SALVAGE_DETAILS, raSizeX | raSizeY | raRepaint, MAKELONG(cxMIN_SALVAGE_R,cyMIN_SALVAGE_R), 0 },
+ { IDOK, raMoveX | raMoveY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/svr_window.cpp.~1~ 2000-11-04 05:02:15.000000000 -0500
+++ ./src/WINNT/afssvrmgr/svr_window.cpp 2003-11-20 16:33:30.000000000 -0500
@@ -31,13 +31,13 @@
#define cyMIN_SERVER 100
static rwWindowData awdServer[] = {
- { IDC_TABS, raSizeX | raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER) },
- { idENDLIST, 0 }
+ { IDC_TABS, raSizeX | raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER), 0 },
+ { idENDLIST, 0, 0, 0 }
};
static rwWindowData awdTabChild[] = {
- { 0, raSizeX | raSizeY },
- { idENDLIST, 0 }
+ { 0, raSizeX | raSizeY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afssvrmgr/window.cpp.~1~ 2000-11-04 05:02:16.000000000 -0500
+++ ./src/WINNT/afssvrmgr/window.cpp 2003-11-20 21:40:22.000000000 -0500
@@ -47,48 +47,48 @@
#define cyMIN_WINDOW 120
rwWindowData awdMain[] = {
- { IDC_CELL_BORDER, raSizeX },
- { IDC_CELL, raSizeX | raRepaint },
- { IDC_AFS_ID, raSizeX | raRepaint },
- { IDC_SERVERS, raSizeX | raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER) },
- { IDC_COVERDLG, raSizeX | raSizeY },
- { IDC_ANIMATE, raMoveX },
- { idENDLIST, 0 }
+ { IDC_CELL_BORDER, raSizeX, 0, 0 },
+ { IDC_CELL, raSizeX | raRepaint, 0, 0 },
+ { IDC_AFS_ID, raSizeX | raRepaint, 0, 0 },
+ { IDC_SERVERS, raSizeX | raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER), 0 },
+ { IDC_COVERDLG, raSizeX | raSizeY, 0, 0 },
+ { IDC_ANIMATE, raMoveX, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
rwWindowData awdMainVert[] = {
- { IDC_CELL_BORDER, raSizeX },
- { IDC_CELL, raSizeX | raRepaint },
- { IDC_AFS_ID, raSizeX | raRepaint },
- { IDC_SERVERS, raSizeX, MAKELONG(cxMIN_SERVER,cyMIN_SERVER) },
- { IDC_SPLITTER_SERVER, raSizeX },
- { IDC_TABS, raSizeX | raSizeY, MAKELONG(cxMIN_TABS,cyMIN_TABS) },
- { IDC_COVERDLG, raSizeX },
- { IDC_ANIMATE, raMoveX },
- { idENDLIST, 0 }
+ { IDC_CELL_BORDER, raSizeX, 0, 0 },
+ { IDC_CELL, raSizeX | raRepaint, 0, 0 },
+ { IDC_AFS_ID, raSizeX | raRepaint, 0, 0 },
+ { IDC_SERVERS, raSizeX, MAKELONG(cxMIN_SERVER,cyMIN_SERVER), 0 },
+ { IDC_SPLITTER_SERVER, raSizeX, 0, 0 },
+ { IDC_TABS, raSizeX | raSizeY, MAKELONG(cxMIN_TABS,cyMIN_TABS), 0 },
+ { IDC_COVERDLG, raSizeX, 0, 0 },
+ { IDC_ANIMATE, raMoveX, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
rwWindowData awdMainHorz[] = {
- { IDC_CELL_BORDER, raSizeX },
- { IDC_CELL, raSizeX | raRepaint },
- { IDC_AFS_ID, raSizeX | raRepaint },
- { IDC_SERVERS, raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER) },
- { IDC_SPLITTER_SERVER, raSizeY },
- { IDC_TABS, raSizeX | raSizeY, MAKELONG(cxMIN_TABS,cyMIN_TABS) },
- { IDC_COVERDLG, raSizeY },
- { IDC_ANIMATE, raMoveX },
- { idENDLIST, 0 }
+ { IDC_CELL_BORDER, raSizeX, 0, 0 },
+ { IDC_CELL, raSizeX | raRepaint, 0, 0 },
+ { IDC_AFS_ID, raSizeX | raRepaint, 0, 0 },
+ { IDC_SERVERS, raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER), 0 },
+ { IDC_SPLITTER_SERVER, raSizeY, 0, 0 },
+ { IDC_TABS, raSizeX | raSizeY, MAKELONG(cxMIN_TABS,cyMIN_TABS), 0 },
+ { IDC_COVERDLG, raSizeY, 0, 0 },
+ { IDC_ANIMATE, raMoveX, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
rwWindowData awdSplitServer[] = {
- { IDC_CELL, raRepaint },
- { IDC_AFS_ID, raRepaint },
- { IDC_SERVERS, raSizeX | raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER) },
- { IDC_SPLITTER_SERVER, raMoveX | raMoveY },
- { IDC_TABS, raMoveX | raMoveY | raSizeXB | raSizeYB, MAKELONG(cxMIN_TABS,cyMIN_TABS) },
- { IDC_COVERDLG, raSizeX | raSizeY },
- { IDC_ANIMATE, 0 },
- { idENDLIST, 0 }
+ { IDC_CELL, raRepaint, 0, 0 },
+ { IDC_AFS_ID, raRepaint, 0, 0 },
+ { IDC_SERVERS, raSizeX | raSizeY, MAKELONG(cxMIN_SERVER,cyMIN_SERVER), 0 },
+ { IDC_SPLITTER_SERVER, raMoveX | raMoveY, 0, 0 },
+ { IDC_TABS, raMoveX | raMoveY | raSizeXB | raSizeYB, MAKELONG(cxMIN_TABS,cyMIN_TABS), 0 },
+ { IDC_COVERDLG, raSizeX | raSizeY, 0, 0 },
+ { IDC_ANIMATE, 0, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afsusrmgr/action.cpp.~1~ 2000-11-04 05:02:22.000000000 -0500
+++ ./src/WINNT/afsusrmgr/action.cpp 2003-11-20 21:40:11.000000000 -0500
@@ -59,9 +59,9 @@
} l;
rwWindowData awdActions[] = {
- { IDC_ACTION_DESC, raSizeX | raRepaint },
- { IDC_ACTION_LIST, raSizeX | raSizeY, MAKELONG(cxMIN_ACTION,cyMIN_ACTION) },
- { idENDLIST, 0 }
+ { IDC_ACTION_DESC, raSizeX | raRepaint, 0, 0 },
+ { IDC_ACTION_LIST, raSizeX | raSizeY, MAKELONG(cxMIN_ACTION,cyMIN_ACTION), 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afsusrmgr/cmdline.cpp.~1~ 2000-11-04 05:02:23.000000000 -0500
+++ ./src/WINNT/afsusrmgr/cmdline.cpp 2003-11-20 15:37:10.000000000 -0500
@@ -38,10 +38,10 @@
BOOL fPresent;
TCHAR szValue[ cchRESOURCE ];
} aSWITCHES[] = {
- { TEXT("cell"), TRUE },
- { TEXT("remote"), TRUE },
- { TEXT("user"), TRUE },
- { TEXT("password"), TRUE }
+ { TEXT("cell"), TRUE, FALSE, TEXT("") },
+ { TEXT("remote"), TRUE, FALSE, TEXT("") },
+ { TEXT("user"), TRUE, FALSE, TEXT("") },
+ { TEXT("password"), TRUE, FALSE, TEXT("") }
};
#define nSWITCHES (sizeof(aSWITCHES) / sizeof(aSWITCHES[0]))
--- ./src/WINNT/afsusrmgr/columns.cpp.~1~ 2000-11-04 05:02:23.000000000 -0500
+++ ./src/WINNT/afsusrmgr/columns.cpp 2003-11-20 15:37:58.000000000 -0500
@@ -55,9 +55,9 @@
}
COLUMNS[] =
{
- { IDS_COL_USERS, FALSE }, // ceUSERS
- { IDS_COL_GROUPS, FALSE }, // ceGROUPS
- { IDS_COL_MACHINES, FALSE }, // ceMACHINES
+ { IDS_COL_USERS, FALSE, {0}, FALSE }, // ceUSERS
+ { IDS_COL_GROUPS, FALSE, {0}, FALSE }, // ceGROUPS
+ { IDS_COL_MACHINES, FALSE, {0}, FALSE }, // ceMACHINES
};
#define nCOLUMNS (sizeof(COLUMNS)/sizeof(COLUMNS[0]))
--- ./src/WINNT/afsusrmgr/grp_tab.cpp.~1~ 2000-11-04 05:02:25.000000000 -0500
+++ ./src/WINNT/afsusrmgr/grp_tab.cpp 2003-11-20 15:39:03.000000000 -0500
@@ -25,16 +25,16 @@
*/
rwWindowData awdGroupsTab[] = {
- { IDC_GROUPS_TITLE, raRepaint | raSizeX },
- { IDC_ADVANCED, raMoveX },
- { IDC_GROUPS_PATTERN, raMoveX },
- { IDC_GROUPS_PATTERN_PROMPT, raRepaint | raMoveX },
- { IDC_GROUPS_LIST, raSizeX | raSizeY },
- { M_GROUP_CREATE, raMoveX | raMoveY },
- { M_MEMBERSHIP, raMoveX | raMoveY },
- { M_PROPERTIES, raMoveX | raMoveY },
- { IDC_STATIC, raRepaint },
- { idENDLIST, 0 }
+ { IDC_GROUPS_TITLE, raRepaint | raSizeX, 0, 0 },
+ { IDC_ADVANCED, raMoveX, 0, 0 },
+ { IDC_GROUPS_PATTERN, raMoveX, 0, 0 },
+ { IDC_GROUPS_PATTERN_PROMPT, raRepaint | raMoveX, 0, 0 },
+ { IDC_GROUPS_LIST, raSizeX | raSizeY, 0, 0 },
+ { M_GROUP_CREATE, raMoveX | raMoveY, 0, 0 },
+ { M_MEMBERSHIP, raMoveX | raMoveY, 0, 0 },
+ { M_PROPERTIES, raMoveX | raMoveY, 0, 0 },
+ { IDC_STATIC, raRepaint, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afsusrmgr/mch_tab.cpp.~1~ 2000-11-04 05:02:28.000000000 -0500
+++ ./src/WINNT/afsusrmgr/mch_tab.cpp 2003-11-20 15:39:35.000000000 -0500
@@ -25,16 +25,16 @@
*/
rwWindowData awdMachinesTab[] = {
- { IDC_MACHINES_TITLE, raRepaint | raSizeX },
- { IDC_ADVANCED, raMoveX },
- { IDC_MACHINES_PATTERN, raMoveX },
- { IDC_MACHINES_PATTERN_PROMPT, raRepaint | raMoveX },
- { IDC_MACHINES_LIST, raSizeX | raSizeY },
- { M_MACHINE_CREATE, raMoveX | raMoveY },
- { M_MEMBERSHIP, raMoveX | raMoveY },
- { M_PROPERTIES, raMoveX | raMoveY },
- { IDC_STATIC, raRepaint },
- { idENDLIST, 0 }
+ { IDC_MACHINES_TITLE, raRepaint | raSizeX, 0, 0 },
+ { IDC_ADVANCED, raMoveX, 0, 0 },
+ { IDC_MACHINES_PATTERN, raMoveX, 0, 0 },
+ { IDC_MACHINES_PATTERN_PROMPT, raRepaint | raMoveX, 0, 0 },
+ { IDC_MACHINES_LIST, raSizeX | raSizeY, 0, 0 },
+ { M_MACHINE_CREATE, raMoveX | raMoveY, 0, 0 },
+ { M_MEMBERSHIP, raMoveX | raMoveY, 0, 0 },
+ { M_PROPERTIES, raMoveX | raMoveY, 0, 0 },
+ { IDC_STATIC, raRepaint, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afsusrmgr/usr_tab.cpp.~1~ 2000-11-04 05:02:31.000000000 -0500
+++ ./src/WINNT/afsusrmgr/usr_tab.cpp 2003-11-20 15:39:52.000000000 -0500
@@ -26,16 +26,16 @@
*/
rwWindowData awdUsersTab[] = {
- { IDC_USERS_TITLE, raRepaint | raSizeX },
- { IDC_ADVANCED, raMoveX },
- { IDC_USERS_PATTERN, raMoveX },
- { IDC_USERS_PATTERN_PROMPT, raRepaint | raMoveX },
- { IDC_USERS_LIST, raSizeX | raSizeY },
- { M_USER_CREATE, raMoveX | raMoveY },
- { M_MEMBERSHIP, raMoveX | raMoveY },
- { M_PROPERTIES, raMoveX | raMoveY },
- { IDC_STATIC, raRepaint },
- { idENDLIST, 0 }
+ { IDC_USERS_TITLE, raRepaint | raSizeX, 0, 0 },
+ { IDC_ADVANCED, raMoveX, 0, 0 },
+ { IDC_USERS_PATTERN, raMoveX, 0, 0 },
+ { IDC_USERS_PATTERN_PROMPT, raRepaint | raMoveX, 0, 0 },
+ { IDC_USERS_LIST, raSizeX | raSizeY, 0, 0 },
+ { M_USER_CREATE, raMoveX | raMoveY, 0, 0 },
+ { M_MEMBERSHIP, raMoveX | raMoveY, 0, 0 },
+ { M_PROPERTIES, raMoveX | raMoveY, 0, 0 },
+ { IDC_STATIC, raRepaint, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/afsusrmgr/window.cpp.~1~ 2000-11-04 05:02:31.000000000 -0500
+++ ./src/WINNT/afsusrmgr/window.cpp 2003-11-20 15:41:12.000000000 -0500
@@ -52,18 +52,18 @@
#define cyMIN_TABS 100
rwWindowData awdMain[] = {
- { IDC_TAB, raSizeX | raSizeY, MAKELONG(cxMIN_TABS,cyMIN_TABS) },
- { IDC_CELL, raSizeX | raRepaint },
- { IDC_CREDS, raSizeX | raRepaint },
- { IDC_ANIM, raMoveX },
- { IDC_BAR, raSizeX },
- { IDC_STATIC, raRepaint },
- { idENDLIST, 0 }
+ { IDC_TAB, raSizeX | raSizeY, MAKELONG(cxMIN_TABS,cyMIN_TABS), 0 },
+ { IDC_CELL, raSizeX | raRepaint, 0, 0 },
+ { IDC_CREDS, raSizeX | raRepaint, 0, 0 },
+ { IDC_ANIM, raMoveX, 0, 0 },
+ { IDC_BAR, raSizeX, 0, 0 },
+ { IDC_STATIC, raRepaint, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
rwWindowData awdTabChild[] = {
- { 0, raSizeX | raSizeY },
- { idENDLIST, 0 }
+ { 0, raSizeX | raSizeY, 0, 0 },
+ { idENDLIST, 0, 0, 0 }
};
--- ./src/WINNT/client_creds/afswiz.cpp.~1~ 2001-11-10 17:31:11.000000000 -0500
+++ ./src/WINNT/client_creds/afswiz.cpp 2003-11-20 15:52:47.000000000 -0500
@@ -74,12 +74,12 @@
} WIZSTEP;
static WIZARD_STATE aStates[] = {
- { STEP_START, IDD_WIZ_START, WizStart_DlgProc },
- { STEP_STARTING, IDD_WIZ_STARTING, WizStarting_DlgProc },
- { STEP_CREDS, IDD_WIZ_CREDS, WizCreds_DlgProc },
- { STEP_MOUNT, IDD_WIZ_MOUNT, WizMount_DlgProc },
- { STEP_MOUNTING, IDD_WIZ_MOUNTING, WizMounting_DlgProc },
- { STEP_FINISH, IDD_WIZ_FINISH, WizFinish_DlgProc },
+ { STEP_START, IDD_WIZ_START, WizStart_DlgProc, 0 },
+ { STEP_STARTING, IDD_WIZ_STARTING, WizStarting_DlgProc, 0 },
+ { STEP_CREDS, IDD_WIZ_CREDS, WizCreds_DlgProc, 0 },
+ { STEP_MOUNT, IDD_WIZ_MOUNT, WizMount_DlgProc, 0 },
+ { STEP_MOUNTING, IDD_WIZ_MOUNTING, WizMounting_DlgProc, 0 },
+ { STEP_FINISH, IDD_WIZ_FINISH, WizFinish_DlgProc, 0 }
};
static const int cStates = sizeof(aStates) / sizeof(aStates[0]);
--- ./src/budb/ol_verify.c.~1~ 2003-07-15 19:14:48.000000000 -0400
+++ ./src/budb/ol_verify.c 2003-11-20 15:32:46.000000000 -0500
@@ -148,6 +148,7 @@
sizeof(((struct tBlock *) NULL)->a[0]),
sizeof(((struct dBlock *) NULL)->a[0]),
0
+ /* FIXME: possible missing initializer here */
};
char *typeName[NBLOCKTYPES] = {
--- ./src/budb/ol_verify.c.~1~ 2003-07-15 19:14:48.000000000 -0400
+++ ./src/budb/ol_verify.c 2003-11-20 15:32:46.000000000 -0500
@@ -157,6 +158,7 @@
"tape",
"dump",
"hashTable"
+ /* FIXME: possible missing initializer here */
};
int hashBlockType[HT_MAX_FUNCTION + 1] = {
--- ./src/budb/ol_verify.c.~1~ 2003-07-15 19:14:48.000000000 -0400
+++ ./src/budb/ol_verify.c 2003-11-20 15:32:46.000000000 -0500
@@ -165,6 +167,7 @@
dump_BLOCK,
tape_BLOCK,
volInfo_BLOCK
+ /* FIXME: possible missing initializer here */
};
/* Compatibility table for the bits in the blockMap. */
--- ./src/des/make_keyperm.c.~1~ 2003-07-15 19:15:00.000000000 -0400
+++ ./src/des/make_keyperm.c 2003-11-18 09:19:47.000000000 -0500
@@ -48,7 +48,7 @@
1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
};
-static int const pc_1[64 + 1] = { 0,
+static int const pc_1[56 + 1] = { 0,
57, 49, 41, 33, 25, 17, 9,
1, 58, 50, 42, 34, 26, 18,
--- ./src/rxkad/rxkad_server.c.~1~ 2003-07-15 19:16:42.000000000 -0400
+++ ./src/rxkad/rxkad_server.c 2003-11-18 12:55:22.000000000 -0500
@@ -59,6 +59,9 @@
rxkad_CheckPacket, /* check data packet */
rxkad_DestroyConnection,
rxkad_GetStats,
+ 0, /* spare 1 */
+ 0, /* spare 2 */
+ 0, /* spare 3 */
};
extern afs_uint32 rx_MyMaxSendSize;
--- ./src/vol/vol-salvage.c.~1~ 2003-08-08 16:40:45.000000000 -0400
+++ ./src/vol/vol-salvage.c 2003-11-20 15:33:31.000000000 -0500
@@ -397,7 +396,7 @@
} childJob_t;
/* Child job this process is running. */
-childJob_t myjob = { SALVAGER_MAGIC, NOT_CHILD };
+childJob_t myjob = { SALVAGER_MAGIC, NOT_CHILD, "" };
int nt_SalvagePartition(char *partName, int jobn);
int nt_SetupPartitionSalvage(void *datap, int len);
--------------080801070500000905080307--