[client] use variable-relative sizeof where possible

This commit is contained in:
Tudor Brindus 2021-08-15 12:18:22 -04:00 committed by Geoffrey McRae
parent 1c5620ba25
commit 14ad83c6b8
14 changed files with 25 additions and 25 deletions

View File

@ -446,7 +446,7 @@ void waylandCBRequest(LG_ClipboardData type)
wl_data_offer_receive(wlCb.offer, wlCb.mimetypes[type], fds[1]); wl_data_offer_receive(wlCb.offer, wlCb.mimetypes[type], fds[1]);
close(fds[1]); close(fds[1]);
struct ClipboardRead * data = malloc(sizeof(struct ClipboardRead)); struct ClipboardRead * data = malloc(sizeof(*data));
if (!data) if (!data)
{ {
DEBUG_ERROR("Failed to allocate memory to read clipboard"); DEBUG_ERROR("Failed to allocate memory to read clipboard");
@ -518,7 +518,7 @@ static void dataSourceHandleSend(void * data, struct wl_data_source * source,
struct WCBTransfer * transfer = (struct WCBTransfer *) data; struct WCBTransfer * transfer = (struct WCBTransfer *) data;
if (containsMimetype(transfer->mimetypes, mimetype)) if (containsMimetype(transfer->mimetypes, mimetype))
{ {
struct ClipboardWrite * data = malloc(sizeof(struct ClipboardWrite)); struct ClipboardWrite * data = malloc(sizeof(*data));
if (!data) if (!data)
{ {
DEBUG_ERROR("Out of memory trying to allocate ClipboardWrite"); DEBUG_ERROR("Out of memory trying to allocate ClipboardWrite");
@ -554,7 +554,7 @@ static const struct wl_data_source_listener dataSourceListener = {
static void waylandCBReplyFn(void * opaque, LG_ClipboardData type, static void waylandCBReplyFn(void * opaque, LG_ClipboardData type,
uint8_t * data, uint32_t size) uint8_t * data, uint32_t size)
{ {
struct WCBTransfer * transfer = malloc(sizeof(struct WCBTransfer)); struct WCBTransfer * transfer = malloc(sizeof(*transfer));
if (!transfer) if (!transfer)
{ {
DEBUG_ERROR("Out of memory when allocating WCBTransfer"); DEBUG_ERROR("Out of memory when allocating WCBTransfer");

View File

@ -135,7 +135,7 @@ static void waylandPollRemoveNode(struct WaylandPoll * node)
bool waylandPollRegister(int fd, WaylandPollCallback callback, void * opaque, uint32_t events) bool waylandPollRegister(int fd, WaylandPollCallback callback, void * opaque, uint32_t events)
{ {
struct WaylandPoll * node = malloc(sizeof(struct WaylandPoll)); struct WaylandPoll * node = malloc(sizeof(*node));
if (!node) if (!node)
return false; return false;

View File

@ -107,7 +107,7 @@ void waylandPresentationFrame(void)
if (!wlWm.presentation) if (!wlWm.presentation)
return; return;
struct FrameData * data = malloc(sizeof(struct FrameData)); struct FrameData * data = malloc(sizeof(*data));
if (clock_gettime(wlWm.clkId, &data->sent)) if (clock_gettime(wlWm.clkId, &data->sent))
{ {
DEBUG_ERROR("clock_gettime failed: %s\n", strerror(errno)); DEBUG_ERROR("clock_gettime failed: %s\n", strerror(errno));

View File

@ -56,7 +56,7 @@ void waylandWindowUpdateScale(void)
static void wlSurfaceEnterHandler(void * data, struct wl_surface * surface, struct wl_output * output) static void wlSurfaceEnterHandler(void * data, struct wl_surface * surface, struct wl_output * output)
{ {
struct SurfaceOutput * node = malloc(sizeof(struct SurfaceOutput)); struct SurfaceOutput * node = malloc(sizeof(*node));
node->output = output; node->output = output;
wl_list_insert(&wlWm.surfaceOutputs, &node->link); wl_list_insert(&wlWm.surfaceOutputs, &node->link);
waylandWindowUpdateScale(); waylandWindowUpdateScale();

View File

@ -153,7 +153,7 @@ static void x11CBReplyFn(void * opaque, LG_ClipboardData type,
static void x11CBSelectionRequest(const XSelectionRequestEvent e) static void x11CBSelectionRequest(const XSelectionRequestEvent e)
{ {
XEvent * s = (XEvent *)malloc(sizeof(XEvent)); XEvent * s = (XEvent *)malloc(sizeof(*s));
s->xselection.type = SelectionNotify; s->xselection.type = SelectionNotify;
s->xselection.requestor = e.requestor; s->xselection.requestor = e.requestor;
s->xselection.selection = e.selection; s->xselection.selection = e.selection;

View File

@ -135,14 +135,14 @@ static void cursorTexFree(struct CursorTex * t)
bool egl_cursorInit(EGL_Cursor ** cursor) bool egl_cursorInit(EGL_Cursor ** cursor)
{ {
*cursor = (EGL_Cursor *)malloc(sizeof(EGL_Cursor)); *cursor = (EGL_Cursor *)malloc(sizeof(**cursor));
if (!*cursor) if (!*cursor)
{ {
DEBUG_ERROR("Failed to malloc EGL_Cursor"); DEBUG_ERROR("Failed to malloc EGL_Cursor");
return false; return false;
} }
memset(*cursor, 0, sizeof(EGL_Cursor)); memset(*cursor, 0, sizeof(**cursor));
LG_LOCK_INIT((*cursor)->lock); LG_LOCK_INIT((*cursor)->lock);
if (!cursorTexInit(&(*cursor)->norm, if (!cursorTexInit(&(*cursor)->norm,

View File

@ -59,7 +59,7 @@ void egl_damageConfigUI(EGL_Damage * damage)
bool egl_damageInit(EGL_Damage ** damage) bool egl_damageInit(EGL_Damage ** damage)
{ {
*damage = (EGL_Damage *)malloc(sizeof(EGL_Damage)); *damage = (EGL_Damage *)malloc(sizeof(**damage));
if (!*damage) if (!*damage)
{ {
DEBUG_ERROR("Failed to malloc EGL_Damage"); DEBUG_ERROR("Failed to malloc EGL_Damage");

View File

@ -40,14 +40,14 @@ struct EGL_DesktopRects
bool egl_desktopRectsInit(EGL_DesktopRects ** rects_, int maxCount) bool egl_desktopRectsInit(EGL_DesktopRects ** rects_, int maxCount)
{ {
EGL_DesktopRects * rects = malloc(sizeof(EGL_DesktopRects)); EGL_DesktopRects * rects = malloc(sizeof(*rects));
if (!rects) if (!rects)
{ {
DEBUG_ERROR("Failed to malloc EGL_DesktopRects"); DEBUG_ERROR("Failed to malloc EGL_DesktopRects");
return false; return false;
} }
*rects_ = rects; *rects_ = rects;
memset(rects, 0, sizeof(EGL_DesktopRects)); memset(rects, 0, sizeof(*rects));
glGenVertexArrays(1, &rects->vao); glGenVertexArrays(1, &rects->vao);
glBindVertexArray(rects->vao); glBindVertexArray(rects->vao);

View File

@ -25,7 +25,7 @@
void egl_drawTorus(EGL_Model * model, unsigned int pts, float x, float y, void egl_drawTorus(EGL_Model * model, unsigned int pts, float x, float y,
float inner, float outer) float inner, float outer)
{ {
GLfloat * v = (GLfloat *)malloc(sizeof(GLfloat) * (pts + 1) * 6); GLfloat * v = (GLfloat *)malloc(sizeof(*v) * (pts + 1) * 6);
GLfloat * dst = v; GLfloat * dst = v;
for(unsigned int i = 0; i <= pts; ++i) for(unsigned int i = 0; i <= pts; ++i)
@ -48,7 +48,7 @@ void egl_drawTorus(EGL_Model * model, unsigned int pts, float x, float y,
void egl_drawTorusArc(EGL_Model * model, unsigned int pts, float x, float y, void egl_drawTorusArc(EGL_Model * model, unsigned int pts, float x, float y,
float inner, float outer, float s, float e) float inner, float outer, float s, float e)
{ {
GLfloat * v = (GLfloat *)malloc(sizeof(GLfloat) * (pts + 1) * 6); GLfloat * v = (GLfloat *)malloc(sizeof(*v) * (pts + 1) * 6);
GLfloat * dst = v; GLfloat * dst = v;
for(unsigned int i = 0; i <= pts; ++i) for(unsigned int i = 0; i <= pts; ++i)

View File

@ -54,14 +54,14 @@ void update_uniform_bindings(EGL_Model * model);
bool egl_modelInit(EGL_Model ** model) bool egl_modelInit(EGL_Model ** model)
{ {
*model = (EGL_Model *)malloc(sizeof(EGL_Model)); *model = (EGL_Model *)malloc(sizeof(**model));
if (!*model) if (!*model)
{ {
DEBUG_ERROR("Failed to malloc EGL_Model"); DEBUG_ERROR("Failed to malloc EGL_Model");
return false; return false;
} }
memset(*model, 0, sizeof(EGL_Model)); memset(*model, 0, sizeof(**model));
(*model)->verticies = ll_new(); (*model)->verticies = ll_new();
@ -123,7 +123,7 @@ void egl_modelSetDefault(EGL_Model * model, bool flipped)
void egl_modelAddVerts(EGL_Model * model, const GLfloat * verticies, const GLfloat * uvs, const size_t count) void egl_modelAddVerts(EGL_Model * model, const GLfloat * verticies, const GLfloat * uvs, const size_t count)
{ {
struct FloatList * fl = (struct FloatList *)malloc(sizeof(struct FloatList)); struct FloatList * fl = (struct FloatList *)malloc(sizeof(*fl));
fl->count = count; fl->count = count;
fl->v = (GLfloat *)malloc(sizeof(GLfloat) * count * 3); fl->v = (GLfloat *)malloc(sizeof(GLfloat) * count * 3);

View File

@ -51,14 +51,14 @@ struct EGL_Splash
bool egl_splashInit(EGL_Splash ** splash) bool egl_splashInit(EGL_Splash ** splash)
{ {
*splash = (EGL_Splash *)malloc(sizeof(EGL_Splash)); *splash = (EGL_Splash *)malloc(sizeof(**splash));
if (!*splash) if (!*splash)
{ {
DEBUG_ERROR("Failed to malloc EGL_Splash"); DEBUG_ERROR("Failed to malloc EGL_Splash");
return false; return false;
} }
memset(*splash, 0, sizeof(EGL_Splash)); memset(*splash, 0, sizeof(**splash));
if (!egl_shaderInit(&(*splash)->bgShader)) if (!egl_shaderInit(&(*splash)->bgShader))
{ {

View File

@ -216,7 +216,7 @@ void app_clipboardRequest(const LG_ClipboardReplyFn replyFn, void * opaque)
if (!g_params.clipboardToLocal) if (!g_params.clipboardToLocal)
return; return;
struct CBRequest * cbr = (struct CBRequest *)malloc(sizeof(struct CBRequest)); struct CBRequest * cbr = (struct CBRequest *)malloc(sizeof(*cbr));
cbr->type = g_state.cbType; cbr->type = g_state.cbType;
cbr->replyFn = replyFn; cbr->replyFn = replyFn;
@ -658,7 +658,7 @@ KeybindHandle app_registerKeybind(int sc, KeybindFn callback, void * opaque, con
return NULL; return NULL;
} }
KeybindHandle handle = (KeybindHandle)malloc(sizeof(struct KeybindHandle)); KeybindHandle handle = (KeybindHandle)malloc(sizeof(*handle));
handle->sc = sc; handle->sc = sc;
handle->callback = callback; handle->callback = callback;
handle->opaque = opaque; handle->opaque = opaque;
@ -711,7 +711,7 @@ void app_registerOverlay(const struct LG_OverlayOps * ops, const void * params)
{ {
ASSERT_LG_OVERLAY_VALID(ops); ASSERT_LG_OVERLAY_VALID(ops);
struct Overlay * overlay = malloc(sizeof(struct Overlay)); struct Overlay * overlay = malloc(sizeof(*overlay));
overlay->ops = ops; overlay->ops = ops;
overlay->params = params; overlay->params = params;
overlay->udata = NULL; overlay->udata = NULL;

View File

@ -41,7 +41,7 @@ struct ll
struct ll * ll_new(void) struct ll * ll_new(void)
{ {
struct ll * list = malloc(sizeof(struct ll)); struct ll * list = malloc(sizeof(*list));
list->head = NULL; list->head = NULL;
list->tail = NULL; list->tail = NULL;
list->pos = NULL; list->pos = NULL;
@ -61,7 +61,7 @@ void ll_free(struct ll * list)
void ll_push(struct ll * list, void * data) void ll_push(struct ll * list, void * data)
{ {
struct ll_item * item = malloc(sizeof(struct ll_item)); struct ll_item * item = malloc(sizeof(*item));
item->data = data; item->data = data;
item->next = NULL; item->next = NULL;

View File

@ -198,7 +198,7 @@ struct LG_OverlayOps LGOverlayGraphs =
GraphHandle overlayGraph_register(const char * name, RingBuffer buffer, float min, float max) GraphHandle overlayGraph_register(const char * name, RingBuffer buffer, float min, float max)
{ {
struct OverlayGraph * graph = malloc(sizeof(struct OverlayGraph)); struct OverlayGraph * graph = malloc(sizeof(*graph));
graph->name = name; graph->name = name;
graph->buffer = buffer; graph->buffer = buffer;
graph->enabled = true; graph->enabled = true;