diff --git a/AffinityPanel.c b/AffinityPanel.c index 82ac12e5..0a964882 100644 --- a/AffinityPanel.c +++ b/AffinityPanel.c @@ -67,7 +67,7 @@ static void MaskItem_display(const Object* cast, RichString* out) { RichString_append(out, CRT_colors[CHECK_TEXT], this->text); } -static ObjectClass MaskItem_class = { +static const ObjectClass MaskItem_class = { .display = MaskItem_display, .delete = MaskItem_delete }; diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c index 59853770..8c90c2a5 100644 --- a/darwin/DarwinProcess.c +++ b/darwin/DarwinProcess.c @@ -16,7 +16,7 @@ in the source distribution for its full text. #include -ProcessClass DarwinProcess_class = { +const ProcessClass DarwinProcess_class = { .super = { .extends = Class(Process), .display = Process_display, diff --git a/darwin/DarwinProcess.h b/darwin/DarwinProcess.h index 11dc2c3c..fc932afe 100644 --- a/darwin/DarwinProcess.h +++ b/darwin/DarwinProcess.h @@ -20,7 +20,7 @@ typedef struct DarwinProcess_ { bool taskAccess; } DarwinProcess; -extern ProcessClass DarwinProcess_class; +extern const ProcessClass DarwinProcess_class; DarwinProcess* DarwinProcess_new(Settings* settings); diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c index 9c5e426e..4c231093 100644 --- a/dragonflybsd/DragonFlyBSDProcess.c +++ b/dragonflybsd/DragonFlyBSDProcess.c @@ -18,7 +18,7 @@ in the source distribution for its full text. #include -ProcessClass DragonFlyBSDProcess_class = { +const ProcessClass DragonFlyBSDProcess_class = { .super = { .extends = Class(Process), .display = Process_display, diff --git a/dragonflybsd/DragonFlyBSDProcess.h b/dragonflybsd/DragonFlyBSDProcess.h index 637dddb0..1c048143 100644 --- a/dragonflybsd/DragonFlyBSDProcess.h +++ b/dragonflybsd/DragonFlyBSDProcess.h @@ -27,7 +27,7 @@ typedef struct DragonFlyBSDProcess_ { //#define Process_isUserlandThread(_process) (_process->pid != _process->tgid) #define Process_isUserlandThread(_process) (_process->nlwp > 1) -extern ProcessClass DragonFlyBSDProcess_class; +extern const ProcessClass DragonFlyBSDProcess_class; extern ProcessFieldData Process_fields[]; diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index 6548ff68..71019494 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -17,7 +17,7 @@ in the source distribution for its full text. #include -ProcessClass FreeBSDProcess_class = { +const ProcessClass FreeBSDProcess_class = { .super = { .extends = Class(Process), .display = Process_display, diff --git a/freebsd/FreeBSDProcess.h b/freebsd/FreeBSDProcess.h index f6fa8b3e..25094848 100644 --- a/freebsd/FreeBSDProcess.h +++ b/freebsd/FreeBSDProcess.h @@ -25,7 +25,7 @@ typedef struct FreeBSDProcess_ { #define Process_isUserlandThread(_process) (_process->pid != _process->tgid) -extern ProcessClass FreeBSDProcess_class; +extern const ProcessClass FreeBSDProcess_class; extern ProcessFieldData Process_fields[]; diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index e6f78f9f..ba0779fb 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -126,7 +126,7 @@ ProcessPidColumn Process_pidColumns[] = { { .id = 0, .label = NULL }, }; -ProcessClass LinuxProcess_class = { +const ProcessClass LinuxProcess_class = { .super = { .extends = Class(Process), .display = Process_display, diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h index 9227dd7f..8113193f 100644 --- a/linux/LinuxProcess.h +++ b/linux/LinuxProcess.h @@ -157,7 +157,7 @@ extern ProcessFieldData Process_fields[]; extern ProcessPidColumn Process_pidColumns[]; -extern ProcessClass LinuxProcess_class; +extern const ProcessClass LinuxProcess_class; LinuxProcess* LinuxProcess_new(Settings* settings); diff --git a/linux/PressureStallMeter.c b/linux/PressureStallMeter.c index a54b4375..307e397d 100644 --- a/linux/PressureStallMeter.c +++ b/linux/PressureStallMeter.c @@ -16,7 +16,7 @@ in the source distribution for its full text. #include "Meter.h" }*/ -static int PressureStallMeter_attributes[] = { +static const int PressureStallMeter_attributes[] = { PRESSURE_STALL_TEN, PRESSURE_STALL_SIXTY, PRESSURE_STALL_THREEHUNDRED }; @@ -52,7 +52,7 @@ static void PressureStallMeter_display(const Object* cast, RichString* out) { RichString_append(out, CRT_colors[PRESSURE_STALL_THREEHUNDRED], buffer); } -MeterClass PressureStallCPUSomeMeter_class = { +const MeterClass PressureStallCPUSomeMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -68,7 +68,7 @@ MeterClass PressureStallCPUSomeMeter_class = { .caption = "Some CPU pressure: " }; -MeterClass PressureStallIOSomeMeter_class = { +const MeterClass PressureStallIOSomeMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -84,7 +84,7 @@ MeterClass PressureStallIOSomeMeter_class = { .caption = "Some IO pressure: " }; -MeterClass PressureStallIOFullMeter_class = { +const MeterClass PressureStallIOFullMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -100,7 +100,7 @@ MeterClass PressureStallIOFullMeter_class = { .caption = "Full IO pressure: " }; -MeterClass PressureStallMemorySomeMeter_class = { +const MeterClass PressureStallMemorySomeMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -116,7 +116,7 @@ MeterClass PressureStallMemorySomeMeter_class = { .caption = "Some Mem pressure: " }; -MeterClass PressureStallMemoryFullMeter_class = { +const MeterClass PressureStallMemoryFullMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, diff --git a/linux/PressureStallMeter.h b/linux/PressureStallMeter.h index 823659ff..1a0ad584 100644 --- a/linux/PressureStallMeter.h +++ b/linux/PressureStallMeter.h @@ -12,14 +12,14 @@ in the source distribution for its full text. #include "Meter.h" -extern MeterClass PressureStallCPUSomeMeter_class; +extern const MeterClass PressureStallCPUSomeMeter_class; -extern MeterClass PressureStallIOSomeMeter_class; +extern const MeterClass PressureStallIOSomeMeter_class; -extern MeterClass PressureStallIOFullMeter_class; +extern const MeterClass PressureStallIOFullMeter_class; -extern MeterClass PressureStallMemorySomeMeter_class; +extern const MeterClass PressureStallMemorySomeMeter_class; -extern MeterClass PressureStallMemoryFullMeter_class; +extern const MeterClass PressureStallMemoryFullMeter_class; #endif diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c index 6b87f372..56bc0771 100644 --- a/openbsd/OpenBSDProcess.c +++ b/openbsd/OpenBSDProcess.c @@ -17,7 +17,7 @@ in the source distribution for its full text. #include -ProcessClass OpenBSDProcess_class = { +const ProcessClass OpenBSDProcess_class = { .super = { .extends = Class(Process), .display = Process_display, diff --git a/openbsd/OpenBSDProcess.h b/openbsd/OpenBSDProcess.h index bd365942..5694a524 100644 --- a/openbsd/OpenBSDProcess.h +++ b/openbsd/OpenBSDProcess.h @@ -21,7 +21,7 @@ typedef struct OpenBSDProcess_ { #define Process_isUserlandThread(_process) (_process->pid != _process->tgid) -extern ProcessClass OpenBSDProcess_class; +extern const ProcessClass OpenBSDProcess_class; extern ProcessFieldData Process_fields[]; diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c index b796c96e..0d994669 100644 --- a/solaris/SolarisProcess.c +++ b/solaris/SolarisProcess.c @@ -18,7 +18,7 @@ in the source distribution for its full text. #include -ProcessClass SolarisProcess_class = { +const ProcessClass SolarisProcess_class = { .super = { .extends = Class(Process), .display = Process_display, diff --git a/solaris/SolarisProcess.h b/solaris/SolarisProcess.h index 2a32f8c7..a1b3b14d 100644 --- a/solaris/SolarisProcess.h +++ b/solaris/SolarisProcess.h @@ -44,7 +44,7 @@ typedef struct SolarisProcess_ { #define Process_isUserlandThread(_process) (_process->pid != _process->tgid) -extern ProcessClass SolarisProcess_class; +extern const ProcessClass SolarisProcess_class; extern ProcessFieldData Process_fields[]; diff --git a/zfs/ZfsArcMeter.c b/zfs/ZfsArcMeter.c index 6301a9c4..acfe13f2 100644 --- a/zfs/ZfsArcMeter.c +++ b/zfs/ZfsArcMeter.c @@ -23,7 +23,7 @@ in the source distribution for its full text. #include "Meter.h" }*/ -int ZfsArcMeter_attributes[] = { +static const int ZfsArcMeter_attributes[] = { ZFS_MFU, ZFS_MRU, ZFS_ANON, ZFS_HEADER, ZFS_OTHER }; @@ -86,7 +86,7 @@ static void ZfsArcMeter_display(const Object* cast, RichString* out) { } } -MeterClass ZfsArcMeter_class = { +const MeterClass ZfsArcMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, diff --git a/zfs/ZfsArcMeter.h b/zfs/ZfsArcMeter.h index 6b9a6e16..cf552bce 100644 --- a/zfs/ZfsArcMeter.h +++ b/zfs/ZfsArcMeter.h @@ -11,10 +11,8 @@ in the source distribution for its full text. #include "Meter.h" -extern int ZfsArcMeter_attributes[]; - void ZfsArcMeter_readStats(Meter* this, ZfsArcStats* stats); -extern MeterClass ZfsArcMeter_class; +extern const MeterClass ZfsArcMeter_class; #endif diff --git a/zfs/ZfsCompressedArcMeter.c b/zfs/ZfsCompressedArcMeter.c index ccf57203..472b5b5b 100644 --- a/zfs/ZfsCompressedArcMeter.c +++ b/zfs/ZfsCompressedArcMeter.c @@ -23,7 +23,7 @@ in the source distribution for its full text. #include "Meter.h" }*/ -int ZfsCompressedArcMeter_attributes[] = { +static const int ZfsCompressedArcMeter_attributes[] = { ZFS_COMPRESSED }; @@ -68,7 +68,7 @@ static void ZfsCompressedArcMeter_display(const Object* cast, RichString* out) { } } -MeterClass ZfsCompressedArcMeter_class = { +const MeterClass ZfsCompressedArcMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, diff --git a/zfs/ZfsCompressedArcMeter.h b/zfs/ZfsCompressedArcMeter.h index 8982eddb..1ad6447d 100644 --- a/zfs/ZfsCompressedArcMeter.h +++ b/zfs/ZfsCompressedArcMeter.h @@ -11,10 +11,8 @@ in the source distribution for its full text. #include "Meter.h" -extern int ZfsCompressedArcMeter_attributes[]; - void ZfsCompressedArcMeter_readStats(Meter* this, ZfsArcStats* stats); -extern MeterClass ZfsCompressedArcMeter_class; +extern const MeterClass ZfsCompressedArcMeter_class; #endif