1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-25 07:32:36 +01:00

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.
This commit is contained in:
Tobias Stoeckmann
2012-05-04 22:53:04 +02:00
committed by Carlos R. Mafra
parent aee0ad45f2
commit cc30444dda
45 changed files with 3 additions and 77 deletions

View File

@@ -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;

View File

@@ -246,7 +246,6 @@ WApplication *wApplicationCreate(WWindow * wwin)
}
wapp = wmalloc(sizeof(WApplication));
memset(wapp, 0, sizeof(WApplication));
wapp->refcount = 1;
wapp->last_focused = NULL;

View File

@@ -479,7 +479,6 @@ void wBalloonInitialize(WScreen * scr)
unsigned long vmask;
bal = wmalloc(sizeof(WBalloon));
memset(bal, 0, sizeof(WBalloon));
scr->balloon = bal;

View File

@@ -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;

View File

@@ -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));

View File

@@ -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;

View File

@@ -264,7 +264,6 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
WMBox *vbox;
panel = wmalloc(sizeof(AppSettingsPanel));
memset(panel, 0, sizeof(AppSettingsPanel));
panel->editedIcon = aicon;

View File

@@ -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) {

View File

@@ -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;

View File

@@ -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,

View File

@@ -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;

View File

@@ -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)) {

View File

@@ -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)

View File

@@ -519,7 +519,6 @@ WScreen *wScreenInit(int screen_number)
int i;
scr = wmalloc(sizeof(WScreen));
memset(scr, 0, sizeof(WScreen));
scr->stacking_list = WMCreateTreeBag();

View File

@@ -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)) {

View File

@@ -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);

View File

@@ -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;

View File

@@ -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];

View File

@@ -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;