Skip to content

(master) render: parentheses around macro argument symbols #2931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metux wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −16
Open

(master) render: parentheses around macro argument symbols #2931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion render/animcur.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static DevPrivateKeyRec AnimCurScreenPrivateKeyRec;
#define GetAnimCur(c) ((AnimCurPtr) ((((char *)(c) + CURSOR_REC_SIZE))))
#define GetAnimCurScreen(s) ((AnimCurScreenPtr)dixLookupPrivate(&(s)->devPrivates, &AnimCurScreenPrivateKeyRec))

#define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = func)
#define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = (func))
#define Unwrap(as,s,elt) ((s)->elt = (as)->elt)

static void AnimCurScreenClose(CallbackListPtr *pcbl, ScreenPtr pScreen, void *unused)
Expand Down
2 changes: 1 addition & 1 deletion render/glyph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ GlyphExtents(int nlist, GlyphListPtr list, GlyphPtr * glyphs, BoxPtr extents)
}
}

#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PIXMAN_FORMAT_RGB(f) != 0)
#define NeedsComponent(f) (PIXMAN_FORMAT_A((f)) != 0 && PIXMAN_FORMAT_RGB((f)) != 0)

void
CompositeGlyphs(CARD8 op,
Expand Down
4 changes: 2 additions & 2 deletions render/glyphstr_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ typedef struct {
} GlyphSetRec, *GlyphSetPtr;

#define GlyphSetGetPrivate(pGlyphSet,k) \
dixLookupPrivate(&(pGlyphSet)->devPrivates, k)
dixLookupPrivate(&(pGlyphSet)->devPrivates, (k))

#define GlyphSetSetPrivate(pGlyphSet,k,ptr) \
dixSetPrivate(&(pGlyphSet)->devPrivates, k, ptr)
dixSetPrivate(&(pGlyphSet)->devPrivates, (k), (ptr))

void GlyphUninit(ScreenPtr pScreen);
GlyphPtr FindGlyphByHash(unsigned char sha1[20], int format);
Expand Down
10 changes: 5 additions & 5 deletions render/picturestr_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ extern RESTYPE PictFormatType;
extern RESTYPE GlyphSetType;

#define VERIFY_PICTURE(pPicture, pid, client, mode) {\
int tmprc = dixLookupResourceByType((void *)&(pPicture), pid,\
PictureType, client, mode);\
int tmprc = dixLookupResourceByType((void *)&(pPicture), (pid),\
PictureType, (client), (mode));\
if (tmprc != Success)\
return tmprc;\
}

#define VERIFY_ALPHA(pPicture, pid, client, mode) {\
if (pid == None) \
pPicture = 0; \
if ((pid) == None) \
(pPicture) = 0; \
else { \
VERIFY_PICTURE(pPicture, pid, client, mode); \
VERIFY_PICTURE((pPicture), (pid), (client), (mode)); \
} \
} \

Expand Down
14 changes: 7 additions & 7 deletions render/render.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ typedef struct _GlyphNew {
unsigned char sha1[20];
} GlyphNewRec, *GlyphNewPtr;

#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PIXMAN_FORMAT_RGB(f) != 0)
#define NeedsComponent(f) (PIXMAN_FORMAT_A((f)) != 0 && PIXMAN_FORMAT_RGB((f)) != 0)

static int
ProcRenderAddGlyphs(ClientPtr client)
Expand Down Expand Up @@ -1461,7 +1461,7 @@ ProcRenderCreateCursor(ClientPtr client)
}

#define GetByte(p,s) (((p) >> (s)) & 0xff)
#define GetColor(p,s) (GetByte(p,s) | (GetByte(p,s) << 8))
#define GetColor(p,s) (GetByte((p),(s)) | (GetByte((p),(s)) << 8))

cm.width = width;
cm.height = height;
Expand Down Expand Up @@ -1897,17 +1897,17 @@ swapStops(void *stuff, int num)

#ifdef XINERAMA
#define VERIFY_XIN_PICTURE(pPicture, pid, client, mode) {\
int rc = dixLookupResourceByType((void **)&(pPicture), pid,\
XRT_PICTURE, client, mode);\
int rc = dixLookupResourceByType((void **)&(pPicture), (pid),\
XRT_PICTURE, (client), (mode));\
if (rc != Success)\
return rc;\
}

#define VERIFY_XIN_ALPHA(pPicture, pid, client, mode) {\
if (pid == None) \
pPicture = 0; \
if ((pid) == None) \
(pPicture) = 0; \
else { \
VERIFY_XIN_PICTURE(pPicture, pid, client, mode); \
VERIFY_XIN_PICTURE((pPicture), (pid), (client), (mode)); \
} \
} \

Expand Down
Loading