From 4d978924cabb617d656d5c20c14a18c4267e18c7 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Wed, 16 Sep 1998 07:32:19 +0000 Subject: [PATCH] Uninitialized variable compiler warnings on Linux git-svn-id: svn://10.0.0.236/trunk@10127 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/lib/layout/layedit.c | 6 +++--- mozilla/lib/layout/laylayer.c | 4 ++-- mozilla/lib/layout/layrelay.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mozilla/lib/layout/layedit.c b/mozilla/lib/layout/layedit.c index e1806f011d8..21c7f0565fb 100644 --- a/mozilla/lib/layout/layedit.c +++ b/mozilla/lib/layout/layedit.c @@ -237,7 +237,7 @@ void lo_MergeState( MWContext *context, lo_DocState *old_state, int32 iStartLine int32 iEndLine, lo_DocState *new_state, int32* pRetY, int32* pRetHeight ) { LO_Element **old_line_array, **new_line_array; - LO_Element *prev_element, *start_element, *eptr, *end_element, *new_end_element; + LO_Element *prev_element, *start_element, *eptr, *end_element, *new_end_element=NULL; int32 yDelta; int32 ele_id; int32 new_line_num; @@ -500,8 +500,8 @@ void lo_MergeElements( MWContext *context, lo_DocState *old_state, int32 iStartL int32 iEndLine, lo_DocState *new_state, int32* pRetY, int32* pRetHeight ) { LO_Element **old_line_array, **new_line_array; - LO_Element *prev_element, *eptr, *end_element, *new_end_element; - int32 yDelta; + LO_Element *prev_element, *eptr, *end_element, *new_end_element=NULL; + int32 yDelta=0; int32 ele_id; int32 new_line_num; int32 new_changed_line_count; diff --git a/mozilla/lib/layout/laylayer.c b/mozilla/lib/layout/laylayer.c index e1b23c3168f..74b85aeb1d4 100644 --- a/mozilla/lib/layout/laylayer.c +++ b/mozilla/lib/layout/laylayer.c @@ -1919,7 +1919,7 @@ lo_AttachHTMLLayer(MWContext *context, CL_Layer *layer, CL_Layer *parent, char *above, char *below, int32 z_order) { CL_Layer *sibling; - CL_LayerPosition pos; + CL_LayerPosition pos=0; if (parent != NULL) { @@ -2771,7 +2771,7 @@ lo_CreateImageLayer(MWContext *context, LO_ImageStruct *image, void lo_ActivateImageLayer(MWContext *context, LO_ImageStruct *image) { - PRBool suppress_mode, is_mocha_image, draw_delayed_icon; + PRBool suppress_mode=PR_FALSE, is_mocha_image, draw_delayed_icon; int x, y; CL_Layer *layer; char *image_url; diff --git a/mozilla/lib/layout/layrelay.c b/mozilla/lib/layout/layrelay.c index 72806f36947..df007fb5c89 100644 --- a/mozilla/lib/layout/layrelay.c +++ b/mozilla/lib/layout/layrelay.c @@ -552,7 +552,7 @@ lo_rl_InitDocState( MWContext *context, lo_DocState *state, int32 width, int32 h XP_FREE_BLOCK(state->line_array); #ifdef XP_WIN16 XP_FREE_BLOCK(state->larray_array); -#endif /* XP_WIN16 */ +#endif /* XP_DELETE(state->font_stack); */ @@ -1405,7 +1405,7 @@ static LO_Element * lo_rl_FitFloat( lo_RelayoutState *relay_state, LO_Element *lo_ele ) { LO_Element *next = lo_tv_GetNextLayoutElement( relay_state->doc_state, lo_ele, TRUE); - int32 x, y; + int32 x=0, y=0; CL_Layer *layer = NULL; if (lo_ele->lo_float.float_ele->lo_any.type == LO_IMAGE) {