summaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2021-02-02 00:13:19 +0100
committerBenBE <BenBE@geshi.org>2021-05-23 09:22:21 +0200
commit6dc485dd20ae2fb1684d965bb9a650ee5b15500a (patch)
treebed2ba9ef7ec2bba951803fd52f92755a1a4d804 /linux
parenta685661866bf5a082571c12d0a47286d4c1547c6 (diff)
Remove duplicate field LinuxProcess->procCmdlineBasenameEnd
This field held practically the same value as cmdlineBasenameEnd
Diffstat (limited to 'linux')
-rw-r--r--linux/LinuxProcess.c2
-rw-r--r--linux/LinuxProcess.h1
-rw-r--r--linux/LinuxProcessList.c5
3 files changed, 2 insertions, 6 deletions
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index 383908e4..614deb4f 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -392,7 +392,7 @@ void LinuxProcess_makeCommandStr(Process* this) {
char *str = strStart;
int cmdlineBasenameOffset = lp->procCmdlineBasenameOffset;
- int cmdlineBasenameEnd = lp->procCmdlineBasenameEnd;
+ int cmdlineBasenameEnd = this->cmdlineBasenameOffset;
if (!cmdline) {
cmdlineBasenameOffset = 0;
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 1c884199..1f61651f 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -64,7 +64,6 @@ typedef struct LinuxProcessMergedCommand_ {
typedef struct LinuxProcess_ {
Process super;
int procCmdlineBasenameOffset;
- int procCmdlineBasenameEnd;
LinuxProcessMergedCommand mergedCommand;
bool isKernelThread;
IOPriority ioPriority;
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
index 97ba9cc0..128b0a27 100644
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@@ -1133,10 +1133,9 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc
LinuxProcess *lp = (LinuxProcess *)process;
lp->mergedCommand.maxLen = lastChar + 1; /* accommodate cmdline */
if (!process->cmdline || !String_eq(command, process->cmdline)) {
- process->cmdlineBasenameOffset = tokenEnd;
free_and_xStrdup(&process->cmdline, command);
lp->procCmdlineBasenameOffset = tokenStart;
- lp->procCmdlineBasenameEnd = tokenEnd;
+ process->cmdlineBasenameOffset = tokenEnd;
lp->mergedCommand.cmdlineChanged = true;
}
@@ -1465,14 +1464,12 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_
proc->cmdlineBasenameOffset = -1;
free_and_xStrdup(&proc->cmdline, command);
lp->procCmdlineBasenameOffset = 0;
- lp->procCmdlineBasenameEnd = 0;
lp->mergedCommand.commChanged = true;
} else if (Process_isThread(proc)) {
if (settings->showThreadNames || Process_isKernelThread(proc)) {
proc->cmdlineBasenameOffset = -1;
free_and_xStrdup(&proc->cmdline, command);
lp->procCmdlineBasenameOffset = 0;
- lp->procCmdlineBasenameEnd = 0;
lp->mergedCommand.commChanged = true;
}

© 2014-2024 Faster IT GmbH | imprint | privacy policy