Re: [patch 2/2] perf jit: remove some no-op error handling

[Stephane Eranian]

On Fri, Jul 15, 2016 at 3:27 PM, Arnaldo Carvalho de Melo
 wrote:
> Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
>> 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.

> - Arnaldo
>
>> Signed-off-by: Dan Carpenter 
>>
>> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
>> index 91bf333..55daeff 100644
>> --- a/tools/perf/jvmti/jvmti_agent.c
>> +++ b/tools/perf/jvmti/jvmti_agent.c
>> @@ -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);

Re: [patch 2/2] perf jit: remove some no-op error handling

[Stephane Eranian]

On Fri, Jul 15, 2016 at 3:27 PM, Arnaldo Carvalho de Melo
 wrote:
> Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
>> 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.

> - Arnaldo
>
>> Signed-off-by: Dan Carpenter 
>>
>> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
>> index 91bf333..55daeff 100644
>> --- a/tools/perf/jvmti/jvmti_agent.c
>> +++ b/tools/perf/jvmti/jvmti_agent.c
>> @@ -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);

Re: [patch 2/2] perf jit: remove some no-op error handling

[Arnaldo Carvalho de Melo]

Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
> 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
 
> Signed-off-by: Dan Carpenter 
> 
> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
> index 91bf333..55daeff 100644
> --- a/tools/perf/jvmti/jvmti_agent.c
> +++ b/tools/perf/jvmti/jvmti_agent.c
> @@ -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);

Re: [patch 2/2] perf jit: remove some no-op error handling

[Arnaldo Carvalho de Melo]

Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
> 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
 
> Signed-off-by: Dan Carpenter 
> 
> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
> index 91bf333..55daeff 100644
> --- a/tools/perf/jvmti/jvmti_agent.c
> +++ b/tools/perf/jvmti/jvmti_agent.c
> @@ -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);

[patch 2/2] perf jit: remove some no-op error handling

[Dan Carpenter]

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.

Signed-off-by: Dan Carpenter 

diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
index 91bf333..55daeff 100644
--- a/tools/perf/jvmti/jvmti_agent.c
+++ b/tools/perf/jvmti/jvmti_agent.c
@@ -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);

[patch 2/2] perf jit: remove some no-op error handling

[Dan Carpenter]

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.

Signed-off-by: Dan Carpenter 

diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
index 91bf333..55daeff 100644
--- a/tools/perf/jvmti/jvmti_agent.c
+++ b/tools/perf/jvmti/jvmti_agent.c
@@ -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);