From: Joe Perches <joe@perches.com> To: Julia Lawall <julia@diku.dk> Cc: walter harms <wharms@bfs.de>, devel@driverdev.osuosl.org, gregkh@suse.de, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] drivers/staging/cx25821: Use kstrdup Date: Mon, 18 Oct 2010 10:38:59 -0700 [thread overview] Message-ID: <1287423539.20968.115.camel@Joe-Laptop> (raw) In-Reply-To: <Pine.LNX.4.64.1010181421240.25099@ask.diku.dk> Perhaps it's more readable code to recheck the field name flag and introduce a temporary char *fname so the slightly unusual reuse of field = kstrdup(field, GFP) becomes field = kstrdup(fname, GFP) --- drivers/staging/cx25821/cx25821-audio-upstream.c | 34 +++--------- .../staging/cx25821/cx25821-video-upstream-ch2.c | 55 +++++++------------- drivers/staging/cx25821/cx25821-video-upstream.c | 53 +++++++------------ 3 files changed, 47 insertions(+), 95 deletions(-) diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c index 27087db..180840f 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.c +++ b/drivers/staging/cx25821/cx25821-audio-upstream.c @@ -723,8 +723,6 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) { struct sram_channel *sram_ch; int retval = 0; - int err = 0; - int str_length = 0; if (dev->_audio_is_running) { printk(KERN_WARNING "Audio Channel is still running so return!\n"); @@ -752,28 +750,14 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) dev->_audio_lines_count = LINES_PER_AUDIO_BUFFER; _line_size = AUDIO_LINE_SIZE; - if (dev->input_audiofilename) { - str_length = strlen(dev->input_audiofilename); - dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_audiofilename) - goto error; - - memcpy(dev->_audiofilename, dev->input_audiofilename, - str_length + 1); - - /* Default if filename is empty string */ - if (strcmp(dev->input_audiofilename, "") == 0) - dev->_audiofilename = "/root/audioGOOD.wav"; - - } else { - str_length = strlen(_defaultAudioName); - dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_audiofilename) - goto error; - - memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1); + if (!dev->input_audiofilename || *dev->input_audiofilename == 0) + dev->_audiofilename = _defaultAudioName; + else + dev->_audiofilename = dev->input_audiofilename; + dev->_audiofilename = kstrdup(dev->_audiofilename, GFP_KERNEL); + if (!dev->_audiofilename) { + retval = -ENOMEM; + goto error; } retval = @@ -802,5 +786,5 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) error: cx25821_dev_unregister(dev); - return err; + return retval; } diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c index d12dbb5..fa7cd70 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c +++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c @@ -747,10 +747,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, struct sram_channel *sram_ch; u32 tmp; int retval = 0; - int err = 0; int data_frame_size = 0; int risc_buffer_size = 0; - int str_length = 0; + char *fname; if (dev->_is_running_ch2) { printk("Video Channel is still running so return!\n"); @@ -788,39 +787,23 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, risc_buffer_size = dev->_isNTSC_ch2 ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE; - if (dev->input_filename_ch2) { - str_length = strlen(dev->input_filename_ch2); - dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename_ch2) - goto error; - - memcpy(dev->_filename_ch2, dev->input_filename_ch2, - str_length + 1); - } else { - str_length = strlen(dev->_defaultname_ch2); - dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename_ch2) - goto error; - - memcpy(dev->_filename_ch2, dev->_defaultname_ch2, - str_length + 1); - } - - /* Default if filename is empty string */ - if (strcmp(dev->input_filename_ch2, "") == 0) { - if (dev->_isNTSC_ch2) { - dev->_filename_ch2 = - (dev->_pixel_format_ch2 == - PIXEL_FRMT_411) ? "/root/vid411.yuv" : - "/root/vidtest.yuv"; - } else { - dev->_filename_ch2 = - (dev->_pixel_format_ch2 == - PIXEL_FRMT_411) ? "/root/pal411.yuv" : - "/root/pal422.yuv"; - } + if (dev->input_filename_ch2 && *dev->input_filename_ch2) + fname = dev->input_filename_ch2; + else if (dev->input_filename_ch2) { + /* Default if filename is empty string */ + if (dev->_isNTSC_ch2) + fname = (dev->_pixel_format_ch2 == PIXEL_FRMT_411) ? + "/root/vid411.yuv" : "/root/vidtest.yuv"; + else + fname = (dev->_pixel_format_ch2 == PIXEL_FRMT_411) ? + "/root/pal411.yuv" : "/root/pal422.yuv"; + } else + fname = dev->_defaultname_ch2; + + dev->_filename_ch2 = kstrdup(fname, GFP_KERNEL); + if (!dev->_filename_ch2) { + retval = -ENOMEM; + goto error; } retval = @@ -851,5 +834,5 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, error: cx25821_dev_unregister(dev); - return err; + return retval; } diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c index 756a820..d51c6c1 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream.c +++ b/drivers/staging/cx25821/cx25821-video-upstream.c @@ -800,10 +800,9 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, struct sram_channel *sram_ch; u32 tmp; int retval = 0; - int err = 0; int data_frame_size = 0; int risc_buffer_size = 0; - int str_length = 0; + char *fname; if (dev->_is_running) { printk(KERN_INFO "Video Channel is still running so return!\n"); @@ -840,37 +839,23 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, risc_buffer_size = dev->_isNTSC ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE; - if (dev->input_filename) { - str_length = strlen(dev->input_filename); - dev->_filename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename) - goto error; - - memcpy(dev->_filename, dev->input_filename, str_length + 1); - } else { - str_length = strlen(dev->_defaultname); - dev->_filename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename) - goto error; - - memcpy(dev->_filename, dev->_defaultname, str_length + 1); - } - - /* Default if filename is empty string */ - if (strcmp(dev->input_filename, "") == 0) { - if (dev->_isNTSC) { - dev->_filename = - (dev->_pixel_format == - PIXEL_FRMT_411) ? "/root/vid411.yuv" : - "/root/vidtest.yuv"; - } else { - dev->_filename = - (dev->_pixel_format == - PIXEL_FRMT_411) ? "/root/pal411.yuv" : - "/root/pal422.yuv"; - } + if (dev->input_filename && *dev->input_filename) + fname = dev->input_filename; + else if (dev->input_filename) { + /* Default if filename is empty string */ + if (dev->_isNTSC) + fname = (dev->_pixel_format == PIXEL_FRMT_411) ? + "/root/vid411.yuv" : "/root/vidtest.yuv"; + else + fname = (dev->_pixel_format == PIXEL_FRMT_411) ? + "/root/pal411.yuv" : "/root/pal422.yuv"; + } else + fname = dev->_defaultname; + + dev->_filename = kstrdup(fname, GFP_KERNEL); + if (!dev->_filename) { + retval = -ENOMEM; + goto error; } dev->_is_running = 0; @@ -908,5 +893,5 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, error: cx25821_dev_unregister(dev); - return err; + return retval; }
WARNING: multiple messages have this Message-ID (diff)
From: Joe Perches <joe@perches.com> To: Julia Lawall <julia@diku.dk> Cc: walter harms <wharms@bfs.de>, devel@driverdev.osuosl.org, gregkh@suse.de, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] drivers/staging/cx25821: Use kstrdup Date: Mon, 18 Oct 2010 17:38:59 +0000 [thread overview] Message-ID: <1287423539.20968.115.camel@Joe-Laptop> (raw) In-Reply-To: <Pine.LNX.4.64.1010181421240.25099@ask.diku.dk> Perhaps it's more readable code to recheck the field name flag and introduce a temporary char *fname so the slightly unusual reuse of field = kstrdup(field, GFP) becomes field = kstrdup(fname, GFP) --- drivers/staging/cx25821/cx25821-audio-upstream.c | 34 +++--------- .../staging/cx25821/cx25821-video-upstream-ch2.c | 55 +++++++------------- drivers/staging/cx25821/cx25821-video-upstream.c | 53 +++++++------------ 3 files changed, 47 insertions(+), 95 deletions(-) diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c index 27087db..180840f 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.c +++ b/drivers/staging/cx25821/cx25821-audio-upstream.c @@ -723,8 +723,6 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) { struct sram_channel *sram_ch; int retval = 0; - int err = 0; - int str_length = 0; if (dev->_audio_is_running) { printk(KERN_WARNING "Audio Channel is still running so return!\n"); @@ -752,28 +750,14 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) dev->_audio_lines_count = LINES_PER_AUDIO_BUFFER; _line_size = AUDIO_LINE_SIZE; - if (dev->input_audiofilename) { - str_length = strlen(dev->input_audiofilename); - dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_audiofilename) - goto error; - - memcpy(dev->_audiofilename, dev->input_audiofilename, - str_length + 1); - - /* Default if filename is empty string */ - if (strcmp(dev->input_audiofilename, "") = 0) - dev->_audiofilename = "/root/audioGOOD.wav"; - - } else { - str_length = strlen(_defaultAudioName); - dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_audiofilename) - goto error; - - memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1); + if (!dev->input_audiofilename || *dev->input_audiofilename = 0) + dev->_audiofilename = _defaultAudioName; + else + dev->_audiofilename = dev->input_audiofilename; + dev->_audiofilename = kstrdup(dev->_audiofilename, GFP_KERNEL); + if (!dev->_audiofilename) { + retval = -ENOMEM; + goto error; } retval @@ -802,5 +786,5 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) error: cx25821_dev_unregister(dev); - return err; + return retval; } diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c index d12dbb5..fa7cd70 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c +++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c @@ -747,10 +747,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, struct sram_channel *sram_ch; u32 tmp; int retval = 0; - int err = 0; int data_frame_size = 0; int risc_buffer_size = 0; - int str_length = 0; + char *fname; if (dev->_is_running_ch2) { printk("Video Channel is still running so return!\n"); @@ -788,39 +787,23 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, risc_buffer_size dev->_isNTSC_ch2 ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE; - if (dev->input_filename_ch2) { - str_length = strlen(dev->input_filename_ch2); - dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename_ch2) - goto error; - - memcpy(dev->_filename_ch2, dev->input_filename_ch2, - str_length + 1); - } else { - str_length = strlen(dev->_defaultname_ch2); - dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename_ch2) - goto error; - - memcpy(dev->_filename_ch2, dev->_defaultname_ch2, - str_length + 1); - } - - /* Default if filename is empty string */ - if (strcmp(dev->input_filename_ch2, "") = 0) { - if (dev->_isNTSC_ch2) { - dev->_filename_ch2 - (dev->_pixel_format_ch2 = - PIXEL_FRMT_411) ? "/root/vid411.yuv" : - "/root/vidtest.yuv"; - } else { - dev->_filename_ch2 - (dev->_pixel_format_ch2 = - PIXEL_FRMT_411) ? "/root/pal411.yuv" : - "/root/pal422.yuv"; - } + if (dev->input_filename_ch2 && *dev->input_filename_ch2) + fname = dev->input_filename_ch2; + else if (dev->input_filename_ch2) { + /* Default if filename is empty string */ + if (dev->_isNTSC_ch2) + fname = (dev->_pixel_format_ch2 = PIXEL_FRMT_411) ? + "/root/vid411.yuv" : "/root/vidtest.yuv"; + else + fname = (dev->_pixel_format_ch2 = PIXEL_FRMT_411) ? + "/root/pal411.yuv" : "/root/pal422.yuv"; + } else + fname = dev->_defaultname_ch2; + + dev->_filename_ch2 = kstrdup(fname, GFP_KERNEL); + if (!dev->_filename_ch2) { + retval = -ENOMEM; + goto error; } retval @@ -851,5 +834,5 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, error: cx25821_dev_unregister(dev); - return err; + return retval; } diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c index 756a820..d51c6c1 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream.c +++ b/drivers/staging/cx25821/cx25821-video-upstream.c @@ -800,10 +800,9 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, struct sram_channel *sram_ch; u32 tmp; int retval = 0; - int err = 0; int data_frame_size = 0; int risc_buffer_size = 0; - int str_length = 0; + char *fname; if (dev->_is_running) { printk(KERN_INFO "Video Channel is still running so return!\n"); @@ -840,37 +839,23 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, risc_buffer_size dev->_isNTSC ? NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE; - if (dev->input_filename) { - str_length = strlen(dev->input_filename); - dev->_filename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename) - goto error; - - memcpy(dev->_filename, dev->input_filename, str_length + 1); - } else { - str_length = strlen(dev->_defaultname); - dev->_filename = kmalloc(str_length + 1, GFP_KERNEL); - - if (!dev->_filename) - goto error; - - memcpy(dev->_filename, dev->_defaultname, str_length + 1); - } - - /* Default if filename is empty string */ - if (strcmp(dev->input_filename, "") = 0) { - if (dev->_isNTSC) { - dev->_filename - (dev->_pixel_format = - PIXEL_FRMT_411) ? "/root/vid411.yuv" : - "/root/vidtest.yuv"; - } else { - dev->_filename - (dev->_pixel_format = - PIXEL_FRMT_411) ? "/root/pal411.yuv" : - "/root/pal422.yuv"; - } + if (dev->input_filename && *dev->input_filename) + fname = dev->input_filename; + else if (dev->input_filename) { + /* Default if filename is empty string */ + if (dev->_isNTSC) + fname = (dev->_pixel_format = PIXEL_FRMT_411) ? + "/root/vid411.yuv" : "/root/vidtest.yuv"; + else + fname = (dev->_pixel_format = PIXEL_FRMT_411) ? + "/root/pal411.yuv" : "/root/pal422.yuv"; + } else + fname = dev->_defaultname; + + dev->_filename = kstrdup(fname, GFP_KERNEL); + if (!dev->_filename) { + retval = -ENOMEM; + goto error; } dev->_is_running = 0; @@ -908,5 +893,5 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, error: cx25821_dev_unregister(dev); - return err; + return retval; }
next prev parent reply other threads:[~2010-10-18 17:39 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-10-17 18:48 [PATCH 0/3] Use kasprintf Julia Lawall 2010-10-17 18:48 ` Julia Lawall 2010-10-17 18:48 ` [PATCH 1/3] drivers/staging/cx25821: " Julia Lawall 2010-10-17 18:48 ` Julia Lawall 2010-10-18 7:15 ` walter harms 2010-10-18 7:15 ` walter harms 2010-10-18 8:22 ` Julia Lawall 2010-10-18 8:22 ` Julia Lawall 2010-10-18 9:27 ` walter harms 2010-10-18 9:27 ` walter harms 2010-10-18 12:25 ` [PATCH 1/3] drivers/staging/cx25821: Use kstrdup Julia Lawall 2010-10-18 12:25 ` Julia Lawall 2010-10-18 17:38 ` Joe Perches [this message] 2010-10-18 17:38 ` Joe Perches 2010-10-18 17:44 ` Julia Lawall 2010-10-18 17:44 ` Julia Lawall 2010-10-18 17:55 ` Joe Perches 2010-10-18 17:55 ` Joe Perches 2010-10-18 17:58 ` Julia Lawall 2010-10-18 17:58 ` Julia Lawall 2010-10-18 20:43 ` Julia Lawall 2010-10-18 20:43 ` Julia Lawall 2010-10-17 18:48 ` [PATCH 2/3] fs/ceph/xattr.c: Use kasprintf Julia Lawall 2010-10-17 18:48 ` Julia Lawall 2010-10-17 18:54 ` Joe Perches 2010-10-17 18:54 ` Joe Perches 2010-10-17 19:02 ` Julia Lawall 2010-10-17 19:02 ` Julia Lawall 2010-10-17 19:55 ` [PATCH 2/3] fs/ceph/xattr.c: Use kmemdup Julia Lawall 2010-10-17 19:55 ` Julia Lawall 2010-10-17 21:36 ` Sage Weil 2010-10-17 21:36 ` Sage Weil 2010-10-17 18:48 ` [PATCH 3/3] fs/jffs2/dir.c: Use kasprintf Julia Lawall 2010-10-17 18:48 ` Julia Lawall 2010-10-17 18:48 ` Julia Lawall [not found] ` <1287341849.20968.62.camel@Joe-Laptop> 2010-10-17 19:56 ` [PATCH 3/3] fs/jffs2/dir.c: Use kmemdup Julia Lawall 2010-10-17 19:56 ` Julia Lawall 2010-10-18 3:43 ` Artem Bityutskiy 2010-10-18 3:43 ` Artem Bityutskiy 2010-10-18 18:09 ` [PATCH 0/3] Use kasprintf Paulo Marques 2010-10-18 18:09 ` Paulo Marques 2010-10-18 20:02 ` Julia Lawall 2010-10-18 20:02 ` Julia Lawall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1287423539.20968.115.camel@Joe-Laptop \ --to=joe@perches.com \ --cc=devel@driverdev.osuosl.org \ --cc=gregkh@suse.de \ --cc=julia@diku.dk \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=wharms@bfs.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.