Skip to contentSkip to conversation

perf jit: remove some no-op error handling

PATCH In review Dan Carpenter 4 participants 4 messages Jul 15, 2016 – Jul 19, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 perf jit: remove some no-op error handling

info.e_machine is a uint16_t so m is never less than zero. It looks like this was maybe left over code from earlier versions so I've just removed it.

tools/perf/jvmti/jvmti_agent.c +1 -6
index 91bf333..55daeff 100644
@@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
 	ssize_t sret;
 	char id[16];
 	int fd, ret = -1;
-	int m = -1;
 	struct {
 		uint16_t e_type;
 		uint16_t e_machine;
@@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
 	if (sret != sizeof(info))
 		goto error;
 
-	m = info.e_machine;
-	if (m < 0)
-		m = 0; /* ELF EM_NONE */
-
-	hdr->elf_mach = m;
+	hdr->elf_mach = info.e_machine;
 	ret = 0;
 error:
 	close(fd);
#1 lore raw

Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:

Quoted 3 lines

info.e_machine is a uint16_t so m is never less than zero. It looks like this was maybe left over code from earlier versions so I've just removed it.

Yeah, it sure looks like that, applying, thanks,

- Arnaldo

Quoted 27 lines
tools/perf/jvmti/jvmti_agent.c +1 -6
index 91bf333..55daeff 100644
@@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
 	ssize_t sret;
 	char id[16];
 	int fd, ret = -1;
-	int m = -1;
 	struct {
 		uint16_t e_type;
 		uint16_t e_machine;
@@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
 	if (sret != sizeof(info))
 		goto error;
 
-	m = info.e_machine;
-	if (m < 0)
-		m = 0; /* ELF EM_NONE */
-
-	hdr->elf_mach = m;
+	hdr->elf_mach = info.e_machine;
 	ret = 0;
 error:
 	close(fd);
#2 lore raw
Quoted 7 lines · Arnaldo Carvalho de Melo

Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:

Quoted 3 lines

info.e_machine is a uint16_t so m is never less than zero. It looks like this was maybe left over code from earlier versions so I've just removed it.

Yeah, it sure looks like that, applying, thanks,

Thanks for cleaning this up.

Quoted 29 lines

- Arnaldo

Quoted 27 lines
tools/perf/jvmti/jvmti_agent.c +1 -6
index 91bf333..55daeff 100644
@@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
      ssize_t sret;
      char id[16];
      int fd, ret = -1;
-     int m = -1;
      struct {
              uint16_t e_type;
              uint16_t e_machine;
@@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
      if (sret != sizeof(info))
              goto error;
 
-     m = info.e_machine;
-     if (m < 0)
-             m = 0; /* ELF EM_NONE */
-
-     hdr->elf_mach = m;
+     hdr->elf_mach = info.e_machine;
      ret = 0;
 error:
      close(fd);
#3 lore raw

[tip:perf/core] perf jit: Remove some no-op error handling

In reply to Dan Carpenter
perf jit: Remove some no-op error handling
Commit-ID:  9fcfcdf3c7b613c0d9536f57587456411b8a4e33
Gitweb:     http://git.kernel.org/tip/9fcfcdf3c7b613c0d9536f57587456411b8a4e33
Author:     Dan Carpenter <[email protected]>
AuthorDate: Sat, 16 Jul 2016 00:08:36 +0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 18 Jul 2016 12:20:00 -0300

perf jit: Remove some no-op error handling

The 'info.e_machine' struct member is an uint16_t so 'm' is never less than zero. It looks like this was maybe left over code from earlier versions so I've just removed it.

---
 tools/perf/jvmti/jvmti_agent.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
tools/perf/jvmti/jvmti_agent.c +1 -6
index 91bf333..55daeff 100644
@@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
 	ssize_t sret;
 	char id[16];
 	int fd, ret = -1;
-	int m = -1;
 	struct {
 		uint16_t e_type;
 		uint16_t e_machine;
@@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
 	if (sret != sizeof(info))
 		goto error;
 
-	m = info.e_machine;
-	if (m < 0)
-		m = 0; /* ELF EM_NONE */
-
-	hdr->elf_mach = m;
+	hdr->elf_mach = info.e_machine;
 	ret = 0;
 error:
 	close(fd);