Skip to content

Align structures 8 byte for 64-bit platforms #1702

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.

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

Merged
merged 1 commit into from
Jun 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 DynamicMeter.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ void DynamicMeters_delete(Hashtable* dynamics) {
}

typedef struct {
ht_key_t key;
const char* name;
ht_key_t key;
bool found;
} DynamicIterator;

Expand Down
2 changes: 1 addition & 1 deletion DynamicScreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ void DynamicScreen_done(DynamicScreen* this) {
}

typedef struct {
ht_key_t key;
const char* name;
ht_key_t key;
bool found;
} DynamicIterator;

Expand Down
4 changes: 2 additions & 2 deletions FunctionBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ in the source distribution for its full text.


typedef struct FunctionBar_ {
int size;
uint32_t size;
bool staticData;
char** functions;
union {
char** keys;
const char* const* constKeys;
} keys;
int* events;
bool staticData;
} FunctionBar;

#define FUNCTIONBAR_MAXEVENTS 15
Expand Down
2 changes: 1 addition & 1 deletion IncSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ typedef enum {

typedef struct IncMode_ {
char buffer[INCMODE_MAX + 1];
size_t index;
FunctionBar* bar;
uint32_t index;
bool isFilter;
} IncMode;

Expand Down
4 changes: 2 additions & 2 deletions ScreenManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ typedef struct ScreenManager_ {
int y1;
int x2;
int y2;
bool allowFocusChange;
uint32_t panelCount;
Vector* panels;
const char* name;
int panelCount;
Header* header;
Machine* host;
State* state;
bool allowFocusChange;
} ScreenManager;

ScreenManager* ScreenManager_new(Header* header, Machine* host, State* state, bool owner);
Expand Down
4 changes: 2 additions & 2 deletions TraceScreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ in the source distribution for its full text.

typedef struct TraceScreen_ {
InfoScreen super;
bool tracing;
pid_t child;
FILE* strace;
pid_t child;
bool tracing;
bool contLine;
bool follow;
bool strace_alive;
Expand Down
2 changes: 1 addition & 1 deletion linux/LinuxProcessTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ typedef struct LinuxProcessTable_ {
bool haveAutogroup;

#ifdef HAVE_DELAYACCT
struct nl_sock* netlink_socket;
int netlink_family;
struct nl_sock* netlink_socket;
#endif
} LinuxProcessTable;

Expand Down