>From 252e6e59b17d4477fec19b41f443b4c4c4bea908 Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <[email protected]>
Date: Fri, 4 May 2012 22:53:04 +0200
Subject: [PATCH] No need to call memset after wmalloc
memset is the last function call in wmalloc, just before it returns the
newly allocated memory. Therefore it is not needed to call it again
after wmalloc call. Although I would prefer to switch wmalloc to a
calloc-based wcalloc function, the compatibility of WINGs for old apps
should be kept.
---
WINGs/data.c | 1 -
WINGs/hashtable.c | 5 ++---
WINGs/proplist.c | 2 --
WINGs/wbutton.c | 1 -
WINGs/wfontpanel.c | 1 -
WPrefs.app/Appearance.c | 4 ----
WPrefs.app/Configurations.c | 1 -
WPrefs.app/Expert.c | 1 -
WPrefs.app/Focus.c | 1 -
WPrefs.app/FontSimple.c | 1 -
WPrefs.app/Icons.c | 1 -
WPrefs.app/KeyboardSettings.c | 1 -
WPrefs.app/KeyboardShortcuts.c | 2 --
WPrefs.app/Menu.c | 3 +--
WPrefs.app/MenuPreferences.c | 1 -
WPrefs.app/MouseSettings.c | 1 -
WPrefs.app/Paths.c | 1 -
WPrefs.app/Preferences.c | 1 -
WPrefs.app/TexturePanel.c | 2 --
WPrefs.app/Themes.c | 1 -
WPrefs.app/WindowHandling.c | 1 -
WPrefs.app/Workspace.c | 1 -
WPrefs.app/double.c | 2 --
WPrefs.app/editmenu.c | 3 ---
src/appicon.c | 2 --
src/application.c | 1 -
src/balloon.c | 1 -
src/defaults.c | 1 -
src/dialog.c | 3 ---
src/dock.c | 7 -------
src/dockedapp.c | 1 -
src/event.c | 1 -
src/framewin.c | 1 -
src/icon.c | 1 -
src/menu.c | 3 ---
src/pixmap.c | 3 ---
src/placement.c | 1 -
src/screen.c | 1 -
src/session.c | 1 -
src/switchpanel.c | 2 --
src/texture.c | 5 -----
src/wcore.c | 2 --
src/window.c | 2 --
util/wmagnify.c | 1 -
util/wmsetbg.c | 1 -
45 files changed, 3 insertions(+), 77 deletions(-)
diff --git a/WINGs/data.c b/WINGs/data.c
index ab0454e..2133b80 100644
--- a/WINGs/data.c
+++ b/WINGs/data.c
@@ -60,7 +60,6 @@ WMData *WMCreateDataWithLength(unsigned length)
aData = WMCreateDataWithCapacity(length);
if (length > 0) {
- memset(aData->bytes, 0, length);
aData->length = length;
}
diff --git a/WINGs/hashtable.c b/WINGs/hashtable.c
index 9822c4e..27e71e4 100644
--- a/WINGs/hashtable.c
+++ b/WINGs/hashtable.c
@@ -98,14 +98,12 @@ WMHashTable *WMCreateHashTable(WMHashTableCallbacks
callbacks)
HashTable *table;
table = wmalloc(sizeof(HashTable));
- memset(table, 0, sizeof(HashTable));
table->callbacks = callbacks;
table->size = INITIAL_CAPACITY;
table->table = wmalloc(sizeof(HashItem *) * table->size);
- memset(table->table, 0, sizeof(HashItem *) * table->size);
return table;
}
@@ -131,8 +129,9 @@ void WMResetHashTable(WMHashTable * table)
wfree(table->table);
table->size = INITIAL_CAPACITY;
table->table = wmalloc(sizeof(HashItem *) * table->size);
+ } else {
+ memset(table->table, 0, sizeof(HashItem *) * table->size);
}
- memset(table->table, 0, sizeof(HashItem *) * table->size);
}
void WMFreeHashTable(WMHashTable * table)
diff --git a/WINGs/proplist.c b/WINGs/proplist.c
index 4121494..7b0f49d 100644
--- a/WINGs/proplist.c
+++ b/WINGs/proplist.c
@@ -1458,7 +1458,6 @@ WMPropList *WMCreatePropListFromDescription(char *desc)
PLData *pldata;
pldata = (PLData *) wmalloc(sizeof(PLData));
- memset(pldata, 0, sizeof(PLData));
pldata->ptr = desc;
pldata->lineNumber = 1;
@@ -1510,7 +1509,6 @@ WMPropList *WMReadPropListFromFile(char *file)
}
pldata = (PLData *) wmalloc(sizeof(PLData));
- memset(pldata, 0, sizeof(PLData));
pldata->ptr = (char *)wmalloc(length + 1);
pldata->filename = file;
pldata->lineNumber = 1;
diff --git a/WINGs/wbutton.c b/WINGs/wbutton.c
index ae4ed4e..3771684 100644
--- a/WINGs/wbutton.c
+++ b/WINGs/wbutton.c
@@ -105,7 +105,6 @@ WMButton *WMCreateCustomButton(WMWidget * parent, int
behaviourMask)
Button *bPtr;
bPtr = wmalloc(sizeof(Button));
- memset(bPtr, 0, sizeof(Button));
bPtr->widgetClass = WC_Button;
diff --git a/WINGs/wfontpanel.c b/WINGs/wfontpanel.c
index 3cf14c8..55b5a1d 100644
--- a/WINGs/wfontpanel.c
+++ b/WINGs/wfontpanel.c
@@ -492,7 +492,6 @@ static void addFontToXftFamily(WMHashTable * families, char
*name, char *style)
array = WMCreateArray(8);
fam = wmalloc(sizeof(Family));
- memset(fam, 0, sizeof(Family));
fam->name = wstrdup(name);
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 47eafd4..3dfe891 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -895,7 +895,6 @@ static void okNewTexture(void *data)
WMScreen *scr = WMWidgetScreen(panel->parent);
titem = wmalloc(sizeof(TextureListItem));
- memset(titem, 0, sizeof(TextureListItem));
HideTexturePanel(panel->texturePanel);
@@ -1275,7 +1274,6 @@ static void fillTextureList(WMList * lPtr)
texture = WMGetFromPLArray(textureList, i);
titem = wmalloc(sizeof(TextureListItem));
- memset(titem, 0, sizeof(TextureListItem));
titem->title =
wstrdup(WMGetFromPLString(WMGetFromPLArray(texture, 0)));
titem->prop = WMRetainPropList(WMGetFromPLArray(texture, 1));
@@ -1876,7 +1874,6 @@ static void setupTextureFor(WMList * list, char *key,
char *defValue, char *titl
TextureListItem *titem;
titem = wmalloc(sizeof(TextureListItem));
- memset(titem, 0, sizeof(TextureListItem));
titem->title = wstrdup(title);
titem->prop = GetObjectForKey(key);
@@ -2044,7 +2041,6 @@ Panel *InitAppearance(WMScreen * scr, WMWindow * win)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Appearance Preferences");
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index a19e947..952fd26 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -467,7 +467,6 @@ Panel *InitConfigurations(WMScreen *scr, WMWidget *parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Other Configurations");
panel->description = _("Animation speeds, titlebar styles, various
option\n"
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index 04b1648..b14f549 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -139,7 +139,6 @@ Panel *InitExpert(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Expert User Preferences");
diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c
index 99a49ea..8a37af5 100644
--- a/WPrefs.app/Focus.c
+++ b/WPrefs.app/Focus.c
@@ -327,7 +327,6 @@ Panel *InitFocus(WMScreen * scr, WMWindow * win)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Window Focus Preferences");
panel->description = _("Keyboard focus switching policy and related
options.");
diff --git a/WPrefs.app/FontSimple.c b/WPrefs.app/FontSimple.c
index 715b343..cde17b0 100644
--- a/WPrefs.app/FontSimple.c
+++ b/WPrefs.app/FontSimple.c
@@ -712,7 +712,6 @@ Panel *InitFontSimple(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Font Configuration");
diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c
index b70caa4..599dfb0 100644
--- a/WPrefs.app/Icons.c
+++ b/WPrefs.app/Icons.c
@@ -316,7 +316,6 @@ Panel *InitIcons(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Icon Preferences");
diff --git a/WPrefs.app/KeyboardSettings.c b/WPrefs.app/KeyboardSettings.c
index 5a67a7f..3dc27eb 100644
--- a/WPrefs.app/KeyboardSettings.c
+++ b/WPrefs.app/KeyboardSettings.c
@@ -160,7 +160,6 @@ Panel *InitKeyboardSettings(WMScreen * scr, WMWidget *
parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Keyboard Preferences");
diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c
index aad8f33..5718653 100644
--- a/WPrefs.app/KeyboardShortcuts.c
+++ b/WPrefs.app/KeyboardShortcuts.c
@@ -512,7 +512,6 @@ static void createPanel(Panel * p)
panel->actionCount = WMGetListNumberOfRows(panel->actLs);
panel->shortcuts = wmalloc(sizeof(char *) * panel->actionCount);
- memset(panel->shortcuts, 0, sizeof(char *) * panel->actionCount);
/***************** Shortcut ****************/
@@ -583,7 +582,6 @@ Panel *InitKeyboardShortcuts(WMScreen * scr, WMWidget *
parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Keyboard Shortcut Preferences");
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index 342e7f0..e9eaa9b 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -155,7 +155,7 @@ static char *commandNames[] = {
"LEGAL_PANEL"
};
-#define NEW(type) memset(wmalloc(sizeof(type)), 0, sizeof(type))
+#define NEW(type) wmalloc(sizeof(type))
#define ICON_FILE "menus"
@@ -1656,7 +1656,6 @@ Panel *InitMenu(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Applications Menu Definition");
diff --git a/WPrefs.app/MenuPreferences.c b/WPrefs.app/MenuPreferences.c
index a579858..b56e8e2 100644
--- a/WPrefs.app/MenuPreferences.c
+++ b/WPrefs.app/MenuPreferences.c
@@ -220,7 +220,6 @@ Panel *InitMenuPreferences(WMScreen * scr, WMWidget *
parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Menu Preferences");
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index ba6801d..b1ed9fc 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -790,7 +790,6 @@ Panel *InitMouseSettings(WMScreen * scr, WMWidget * parent)
wheelActions[1] = wstrdup(_("Switch Workspaces"));
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Mouse Preferences");
diff --git a/WPrefs.app/Paths.c b/WPrefs.app/Paths.c
index b886e2e..ed515e5 100644
--- a/WPrefs.app/Paths.c
+++ b/WPrefs.app/Paths.c
@@ -307,7 +307,6 @@ Panel *InitPaths(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Search Path Configuration");
diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index 2c60f05..6d0217d 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -325,7 +325,6 @@ Panel *InitPreferences(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Miscellaneous Ergonomic Preferences");
panel->description = _("Various settings like balloon text, geometry\n"
"displays etc.");
diff --git a/WPrefs.app/TexturePanel.c b/WPrefs.app/TexturePanel.c
index ae3ee64..ad78b20 100644
--- a/WPrefs.app/TexturePanel.c
+++ b/WPrefs.app/TexturePanel.c
@@ -463,7 +463,6 @@ static void gradAddCallback(WMWidget * w, void *data)
row = WMGetListSelectedItemRow(panel->gcolL) + 1;
item = WMInsertListItem(panel->gcolL, row, "00,00,00");
rgb = wmalloc(sizeof(RColor));
- memset(rgb, 0, sizeof(RColor));
item->clientData = rgb;
WMSelectListItem(panel->gcolL, row);
@@ -1120,7 +1119,6 @@ TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
WMScreen *scr = WMWidgetScreen(keyWindow);
panel = wmalloc(sizeof(TexturePanel));
- memset(panel, 0, sizeof(TexturePanel));
panel->listFont = WMSystemFontOfSize(scr, 12);
diff --git a/WPrefs.app/Themes.c b/WPrefs.app/Themes.c
index 0416808..453dd5c 100644
--- a/WPrefs.app/Themes.c
+++ b/WPrefs.app/Themes.c
@@ -207,7 +207,6 @@ Panel *InitThemes(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Themes");
diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c
index 88b5fef..0770ed5 100644
--- a/WPrefs.app/WindowHandling.c
+++ b/WPrefs.app/WindowHandling.c
@@ -500,7 +500,6 @@ Panel *InitWindowHandling(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Window Handling Preferences");
diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index cdc0727..6ba26fc 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -327,7 +327,6 @@ Panel *InitWorkspace(WMScreen * scr, WMWidget * parent)
_Panel *panel;
panel = wmalloc(sizeof(_Panel));
- memset(panel, 0, sizeof(_Panel));
panel->sectionName = _("Workspace Preferences");
diff --git a/WPrefs.app/double.c b/WPrefs.app/double.c
index 92bcee2..d708b0d 100644
--- a/WPrefs.app/double.c
+++ b/WPrefs.app/double.c
@@ -55,8 +55,6 @@ DoubleTest *CreateDoubleTest(WMWidget * parent, char *text)
/* allocate some storage for our new widget instance */
dPtr = wmalloc(sizeof(DoubleTest));
- /* initialize it */
- memset(dPtr, 0, sizeof(DoubleTest));
/* set the class ID */
dPtr->widgetClass = DoubleTestClass;
diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c
index c5c3f41..244a5be 100644
--- a/WPrefs.app/editmenu.c
+++ b/WPrefs.app/editmenu.c
@@ -125,8 +125,6 @@ WEditMenuItem *WCreateEditMenuItem(WMWidget * parent, char
*title, Bool isTitle)
iPtr = wmalloc(sizeof(WEditMenuItem));
- memset(iPtr, 0, sizeof(WEditMenuItem));
-
iPtr->widgetClass = EditMenuItemClass;
iPtr->view = W_CreateView(W_VIEW(parent));
@@ -373,7 +371,6 @@ static WEditMenu *makeEditMenu(WMScreen * scr, WMWidget *
parent, char *title)
InitEditMenu(scr);
mPtr = wmalloc(sizeof(WEditMenu));
- memset(mPtr, 0, sizeof(WEditMenu));
mPtr->widgetClass = EditMenuClass;
diff --git a/src/appicon.c b/src/appicon.c
index 80f08f4..198fe53 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -69,7 +69,6 @@ WAppIcon *wAppIconCreateForDock(WScreen * scr, char *command,
char *wm_instance,
dicon = wmalloc(sizeof(WAppIcon));
wretain(dicon);
- memset(dicon, 0, sizeof(WAppIcon));
dicon->yindex = -1;
dicon->xindex = -1;
@@ -122,7 +121,6 @@ WAppIcon *wAppIconCreate(WWindow * leader_win)
aicon = wmalloc(sizeof(WAppIcon));
wretain(aicon);
- memset(aicon, 0, sizeof(WAppIcon));
aicon->yindex = -1;
aicon->xindex = -1;
diff --git a/src/application.c b/src/application.c
index 584c0aa..18ff57b 100644
--- a/src/application.c
+++ b/src/application.c
@@ -246,7 +246,6 @@ WApplication *wApplicationCreate(WWindow * wwin)
}
wapp = wmalloc(sizeof(WApplication));
- memset(wapp, 0, sizeof(WApplication));
wapp->refcount = 1;
wapp->last_focused = NULL;
diff --git a/src/balloon.c b/src/balloon.c
index 517dc92..c00375a 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -479,7 +479,6 @@ void wBalloonInitialize(WScreen * scr)
unsigned long vmask;
bal = wmalloc(sizeof(WBalloon));
- memset(bal, 0, sizeof(WBalloon));
scr->balloon = bal;
diff --git a/src/defaults.c b/src/defaults.c
index 1f6b6eb..40c4122 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -813,7 +813,6 @@ WDDomain *wDefaultsInitDomain(char *domain, Bool
requireDictionary)
}
db = wmalloc(sizeof(WDDomain));
- memset(db, 0, sizeof(WDDomain));
db->domain_name = domain;
db->path = wdefaultspathfordomain(domain);
the_path = db->path;
diff --git a/src/dialog.c b/src/dialog.c
index e4c8f34..f2ec900 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -885,7 +885,6 @@ Bool wIconChooserDialog(WScreen * scr, char **file, char
*instance, char *class)
Bool result;
panel = wmalloc(sizeof(IconPanel));
- memset(panel, 0, sizeof(IconPanel));
panel->scr = scr;
@@ -1128,7 +1127,6 @@ void wShowInfoPanel(WScreen * scr)
}
panel = wmalloc(sizeof(InfoPanel));
- memset(panel, 0, sizeof(InfoPanel));
panel->scr = scr;
@@ -1521,7 +1519,6 @@ int wShowCrashingDialogPanel(int whatSig)
char buf[256];
panel = wmalloc(sizeof(CrashPanel));
- memset(panel, 0, sizeof(CrashPanel));
screen_no = DefaultScreen(dpy);
scr_width = WidthOfScreen(ScreenOfDisplay(dpy, screen_no));
diff --git a/src/dock.c b/src/dock.c
index 61d70f0..9d12814 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1057,12 +1057,10 @@ WDock *wDockCreate(WScreen *scr, int type)
make_keys();
dock = wmalloc(sizeof(WDock));
- memset(dock, 0, sizeof(WDock));
dock->max_icons = DOCK_MAX_ICONS;
dock->icon_array = wmalloc(sizeof(WAppIcon *) * dock->max_icons);
- memset(dock->icon_array, 0, sizeof(WAppIcon *) * dock->max_icons);
btn = mainIconCreate(scr, type);
@@ -1788,7 +1786,6 @@ void wDockDoAutoLaunch(WDock *dock, int workspace)
continue;
state = wmalloc(sizeof(WSavedState));
- memset(state, 0, sizeof(WSavedState));
state->workspace = workspace;
/* TODO: this is klugy and is very difficult to understand
* what's going on. Try to clean up */
@@ -2448,9 +2445,7 @@ Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int
*y_pos)
hcount = WMIN(dock->max_icons, scr->scr_width / ICON_SIZE);
vcount = WMIN(dock->max_icons, scr->scr_height / ICON_SIZE);
hmap = wmalloc(hcount + 1);
- memset(hmap, 0, hcount + 1);
vmap = wmalloc(vcount + 1);
- memset(vmap, 0, vcount + 1);
/* mark used positions */
switch (corner) {
@@ -2582,7 +2577,6 @@ Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int
*y_pos)
r = (mwidth - 1) / 2;
slot_map = wmalloc(mwidth * mwidth);
- memset(slot_map, 0, mwidth * mwidth);
#define XY2OFS(x,y) (WMAX(abs(x),abs(y)) > r) ? 0 : (((y)+r)*(mwidth)+(x)+r)
@@ -2744,7 +2738,6 @@ static pid_t execCommand(WAppIcon *btn, char *command,
WSavedState *state)
if (pid > 0) {
if (!state) {
state = wmalloc(sizeof(WSavedState));
- memset(state, 0, sizeof(WSavedState));
state->hidden = -1;
state->miniaturized = -1;
state->shaded = -1;
diff --git a/src/dockedapp.c b/src/dockedapp.c
index 944e025..5ef64f6 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -264,7 +264,6 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
WMBox *vbox;
panel = wmalloc(sizeof(AppSettingsPanel));
- memset(panel, 0, sizeof(AppSettingsPanel));
panel->editedIcon = aicon;
diff --git a/src/event.c b/src/event.c
index 2eb0248..b6a9613 100644
--- a/src/event.c
+++ b/src/event.c
@@ -966,7 +966,6 @@ static void handleClientMessage(XEvent * event)
len = sizeof(event->xclient.data.b) + 1;
command = wmalloc(len);
- memset(command, 0, len);
strncpy(command, event->xclient.data.b,
sizeof(event->xclient.data.b));
if (strncmp(command, "Reconfigure", sizeof("Reconfigure")) ==
0) {
diff --git a/src/framewin.c b/src/framewin.c
index 73f68b2..2d3c009 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -67,7 +67,6 @@ WFrameWindow *wFrameWindowCreate(WScreen * scr, int wlevel,
int x, int y,
WFrameWindow *fwin;
fwin = wmalloc(sizeof(WFrameWindow));
- memset(fwin, 0, sizeof(WFrameWindow));
fwin->screen_ptr = scr;
diff --git a/src/icon.c b/src/icon.c
index 73dae74..2a6d774 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -189,7 +189,6 @@ static WIcon *wIconCreateCore(WScreen *scr, int coord_x,
int coord_y)
XSetWindowAttributes attribs;
icon = wmalloc(sizeof(WIcon));
- memset(icon, 0, sizeof(WIcon));
icon->core = wCoreCreateTopLevel(scr,
coord_x,
coord_y,
diff --git a/src/menu.c b/src/menu.c
index 2d26ee7..f438385 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -146,8 +146,6 @@ WMenu *wMenuCreate(WScreen * screen, char *title, int
main_menu)
menu = wmalloc(sizeof(WMenu));
- memset(menu, 0, sizeof(WMenu));
-
#ifdef SINGLE_MENULEVEL
tmp = WMSubmenuLevel;
#else
@@ -274,7 +272,6 @@ WMenuEntry *wMenuInsertCallback(WMenu * menu, int index,
char *text,
menu->brother->alloced_entries = menu->alloced_entries;
}
entry = wmalloc(sizeof(WMenuEntry));
- memset(entry, 0, sizeof(WMenuEntry));
entry->flags.enabled = 1;
entry->text = wstrdup(text);
entry->cascade = -1;
diff --git a/src/pixmap.c b/src/pixmap.c
index 62c4ceb..d6b9431 100644
--- a/src/pixmap.c
+++ b/src/pixmap.c
@@ -53,7 +53,6 @@ WPixmap *wPixmapCreateFromXPMData(WScreen * scr, char **data)
return NULL;
pix = wmalloc(sizeof(WPixmap));
- memset(pix, 0, sizeof(WPixmap));
RConvertImageMask(scr->rcontext, image, &pix->image, &pix->mask, 128);
@@ -83,7 +82,6 @@ WPixmap *wPixmapCreateFromXBMData(WScreen * scr, char *data,
char *mask,
WPixmap *pix;
pix = wmalloc(sizeof(WPixmap));
- memset(pix, 0, sizeof(WPixmap));
pix->image = XCreatePixmapFromBitmapData(dpy, scr->w_win, data, width,
height, fg, bg, scr->w_depth);
if (pix->image == None) {
wfree(pix);
@@ -108,7 +106,6 @@ WPixmap *wPixmapCreate(WScreen * scr, Pixmap image, Pixmap
mask)
unsigned int width, height, depth, baz;
pix = wmalloc(sizeof(WPixmap));
- memset(pix, 0, sizeof(WPixmap));
pix->image = image;
pix->mask = mask;
if (!XGetGeometry(dpy, image, &foo, &bar, &bar, &width, &height, &baz,
&depth)) {
diff --git a/src/placement.c b/src/placement.c
index a3cdd23..93ba39a 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -169,7 +169,6 @@ void PlaceIcon(WScreen *scr, int *x_ret, int *y_ret, int
head)
* but complexity is much better (faster) than it.
*/
map = wmalloc((sw + 2) * (sh + 2));
- memset(map, 0, (sw + 2) * (sh + 2));
#define INDEX(x,y) (((y)+1)*(sw+2) + (x) + 1)
diff --git a/src/screen.c b/src/screen.c
index b0fb88e..4f279f0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -519,7 +519,6 @@ WScreen *wScreenInit(int screen_number)
int i;
scr = wmalloc(sizeof(WScreen));
- memset(scr, 0, sizeof(WScreen));
scr->stacking_list = WMCreateTreeBag();
diff --git a/src/session.c b/src/session.c
index 9dba574..421150b 100644
--- a/src/session.c
+++ b/src/session.c
@@ -370,7 +370,6 @@ static WSavedState *getWindowState(WScreen * scr,
WMPropList * win_state)
unsigned mask;
int i;
- memset(state, 0, sizeof(WSavedState));
state->workspace = -1;
value = WMGetFromPLDictionary(win_state, sWorkspace);
if (value && WMIsPLString(value)) {
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 23972a1..8e9e9f6 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -435,8 +435,6 @@ WSwitchPanel *wInitSwitchPanel(WScreen * scr, WWindow *
curwin, Bool class_only)
WMRect rect;
rect = wGetRectForHead(scr, wGetHeadForPointerLocation(scr));
- memset(panel, 0, sizeof(WSwitchPanel));
-
panel->scr = scr;
panel->windows = makeWindowListArray(curwin, wPreferences.swtileImage
!= NULL, class_only);
diff --git a/src/texture.c b/src/texture.c
index dca7b98..a29406a 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -180,7 +180,6 @@ WTexGradient *wTextureMakeGradient(WScreen * scr, int
style, RColor * from, RCol
XGCValues gcv;
texture = wmalloc(sizeof(WTexture));
- memset(texture, 0, sizeof(WTexture));
texture->type = style;
texture->subtype = 0;
@@ -207,7 +206,6 @@ WTexIGradient *wTextureMakeIGradient(WScreen * scr, int
thickness1, RColor color
int i;
texture = wmalloc(sizeof(WTexture));
- memset(texture, 0, sizeof(WTexture));
texture->type = WTEX_IGRADIENT;
for (i = 0; i < 2; i++) {
texture->colors1[i] = colors1[i];
@@ -239,7 +237,6 @@ WTexMGradient *wTextureMakeMGradient(WScreen * scr, int
style, RColor ** colors)
int i;
texture = wmalloc(sizeof(WTexture));
- memset(texture, 0, sizeof(WTexture));
texture->type = style;
texture->subtype = 0;
@@ -272,7 +269,6 @@ WTexPixmap *wTextureMakePixmap(WScreen * scr, int style,
char *pixmap_file, XCol
return NULL;
texture = wmalloc(sizeof(WTexture));
- memset(texture, 0, sizeof(WTexture));
texture->type = WTEX_PIXMAP;
texture->subtype = style;
@@ -300,7 +296,6 @@ WTexTGradient *wTextureMakeTGradient(WScreen * scr, int
style, RColor * from, RC
return NULL;
texture = wmalloc(sizeof(WTexture));
- memset(texture, 0, sizeof(WTexture));
texture->type = style;
texture->opacity = opacity;
diff --git a/src/wcore.c b/src/wcore.c
index 854c573..ac896a5 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -53,7 +53,6 @@ WCoreWindow *wCoreCreateTopLevel(WScreen * screen, int x, int
y, int width, int
XSetWindowAttributes attribs;
core = wmalloc(sizeof(WCoreWindow));
- memset(core, 0, sizeof(WCoreWindow));
/* don't set CWBackPixel so that transparent XRender windows
are see-through */
@@ -109,7 +108,6 @@ WCoreWindow *wCoreCreate(WCoreWindow * parent, int x, int
y, int width, int heig
XSetWindowAttributes attribs;
core = wmalloc(sizeof(WCoreWindow));
- memset(core, 0, sizeof(WCoreWindow));
vmask = /*CWBackPixmap|CWBackPixel| */ CWBorderPixel | CWCursor |
CWEventMask;
attribs.cursor = wCursor[WCUR_DEFAULT];
diff --git a/src/window.c b/src/window.c
index f05be9e..b3802eb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -167,8 +167,6 @@ WWindow *wWindowCreate(void)
wwin = wmalloc(sizeof(WWindow));
wretain(wwin);
- memset(wwin, 0, sizeof(WWindow));
-
wwin->client_descriptor.handle_mousedown = frameMouseDown;
wwin->client_descriptor.parent = wwin;
wwin->client_descriptor.self = wwin;
diff --git a/util/wmagnify.c b/util/wmagnify.c
index 3bb7a37..91e2d2a 100644
--- a/util/wmagnify.c
+++ b/util/wmagnify.c
@@ -99,7 +99,6 @@ static BufferData *makeBufferData(WMWindow * win, WMLabel *
label, int width, in
width /= magfactor;
height /= magfactor;
data->buffer = wmalloc(sizeof(unsigned long) * width * height);
- memset(data->buffer, 0, width * height * sizeof(unsigned long));
data->width = width;
data->height = height;
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index 17b0583..86d1f91 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -277,7 +277,6 @@ BackgroundTexture *parseTexture(RContext * rc, char *text)
}
texture = wmalloc(sizeof(BackgroundTexture));
- memset(texture, 0, sizeof(BackgroundTexture));
GETSTRORGOTO(val, type, 0, error);
--
1.7.6
--
To unsubscribe, send mail to [email protected].
