On 11/29/2020 7:50 PM, Richard Cochran wrote:
> The names of the source and destination clocks are generated by
> duplicating command line arguments, and then the newly allocated
> memory is immediately freed.  Remove the unnecessary malloc/free dance
> and use the arguments directly.
> 
> Signed-off-by: Richard Cochran <richardcoch...@gmail.com>

Yep, makes sense.

Reviewed-by: Jacob Keller <jacob.e.kel...@intel.com>

> ---
>  phc2sys.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/phc2sys.c b/phc2sys.c
> index c300984..13cf235 100644
> --- a/phc2sys.c
> +++ b/phc2sys.c
> @@ -1071,7 +1071,7 @@ int main(int argc, char *argv[])
>                       rt++;
>                       break;
>               case 'c':
> -                     dst_name = strdup(optarg);
> +                     dst_name = optarg;
>                       break;
>               case 'd':
>                       pps_fd = open(optarg, O_RDONLY);
> @@ -1089,7 +1089,7 @@ int main(int argc, char *argv[])
>                               "'-i' has been deprecated. please use '-s' 
> instead.\n");
>              /* fallthrough */
>               case 's':
> -                     src_name = strdup(optarg);
> +                     src_name = optarg;
>                       break;
>               case 'E':
>                       if (!strcasecmp(optarg, "pi")) {
> @@ -1267,20 +1267,16 @@ int main(int argc, char *argv[])
>       }
>  
>       src = clock_add(&priv, src_name);
> -     free(src_name);
>       if (!src) {
> -             fprintf(stderr,
> -                     "valid source clock must be selected.\n");
> +             fprintf(stderr, "valid source clock must be selected.\n");
>               goto bad_usage;
>       }
>       src->state = PS_SLAVE;
>       priv.master = src;
>  
>       dst = clock_add(&priv, dst_name ? dst_name : "CLOCK_REALTIME");
> -     free(dst_name);
>       if (!dst) {
> -             fprintf(stderr,
> -                     "valid destination clock must be selected.\n");
> +             fprintf(stderr, "valid destination clock must be selected.\n");
>               goto bad_usage;
>       }
>       dst->state = PS_MASTER;
> 


_______________________________________________
Linuxptp-devel mailing list
Linuxptp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel

Reply via email to