diff for duplicates of <4CBBF407.7060705@bfs.de> diff --git a/a/1.txt b/N1/1.txt index c05be0e..095a4a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,10 +33,11 @@ Julia Lawall schrieb: > len = strlen(arg) > ... when != len = e1 > when != arg = e2 -> a > - \(kmalloc\|kzalloc\)(len+1,flag) +> a = +> - \(kmalloc\|kzalloc\)(len+1,flag) > + kasprintf(flag,"%s",arg) > <... when != a -> if (a = NULL || ...) S +> if (a == NULL || ...) S > ...> > - memcpy(a,arg,len+1); > // </smpl> @@ -80,7 +81,7 @@ Julia Lawall schrieb: > - str_length + 1); > - > - /* Default if filename is empty string */ -> - if (strcmp(dev->input_audiofilename, "") = 0) +> - if (strcmp(dev->input_audiofilename, "") == 0) > - dev->_audiofilename = "/root/audioGOOD.wav"; > - > - } else { @@ -105,7 +106,7 @@ Julia Lawall schrieb: Is filename needed here at all ? The if statement looks strange this looks more familar to me: -if (!dev->input_audiofilename || *dev->input_audiofilename=0) +if (!dev->input_audiofilename || *dev->input_audiofilename==0) filename = _defaultAudioName; else filename = dev->input_audiofilename; @@ -114,7 +115,8 @@ re wh -> retval > @@ -802,5 +788,5 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) +> retval = +> @@ -802,5 +788,5 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) > error: > cx25821_dev_unregister(dev); > @@ -161,24 +163,28 @@ re > - } > - > - /* Default if filename is empty string */ -> - if (strcmp(dev->input_filename_ch2, "") = 0) { +> - if (strcmp(dev->input_filename_ch2, "") == 0) { > - if (dev->_isNTSC_ch2) { -> - dev->_filename_ch2 > - (dev->_pixel_format_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 = +> - dev->_filename_ch2 = +> - (dev->_pixel_format_ch2 == > - PIXEL_FRMT_411) ? "/root/pal411.yuv" : > - "/root/pal422.yuv"; > - } > + /* Default if filename is empty string */ -> + if (strcmp(dev->input_filename_ch2, "") = 0) { +> + if (strcmp(dev->input_filename_ch2, "") == 0) { > + if (dev->_isNTSC_ch2) -> + filename > + (dev->_pixel_format_ch2 = +> + filename = +> + (dev->_pixel_format_ch2 == > + PIXEL_FRMT_411) ? "/root/vid411.yuv" : > + "/root/vidtest.yuv"; > + else -> + filename > + (dev->_pixel_format_ch2 = +> + filename = +> + (dev->_pixel_format_ch2 == > + PIXEL_FRMT_411) ? "/root/pal411.yuv" : > + "/root/pal422.yuv"; > + } else @@ -191,7 +197,8 @@ re > + goto error; > } > -> retval > @@ -851,5 +838,5 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, +> retval = +> @@ -851,5 +838,5 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, > error: > cx25821_dev_unregister(dev); > @@ -236,24 +243,28 @@ re > - } > - > - /* Default if filename is empty string */ -> - if (strcmp(dev->input_filename, "") = 0) { +> - if (strcmp(dev->input_filename, "") == 0) { > - if (dev->_isNTSC) { -> - dev->_filename > - (dev->_pixel_format = +> - dev->_filename = +> - (dev->_pixel_format == > - PIXEL_FRMT_411) ? "/root/vid411.yuv" : > - "/root/vidtest.yuv"; > - } else { -> - dev->_filename > - (dev->_pixel_format = +> - dev->_filename = +> - (dev->_pixel_format == > - PIXEL_FRMT_411) ? "/root/pal411.yuv" : > - "/root/pal422.yuv"; > - } > + /* Default if filename is empty string */ -> + if (strcmp(dev->input_filename, "") = 0) { +> + if (strcmp(dev->input_filename, "") == 0) { > + if (dev->_isNTSC) -> + filename > + (dev->_pixel_format = +> + filename = +> + (dev->_pixel_format == > + PIXEL_FRMT_411) ? "/root/vid411.yuv" : > + "/root/vidtest.yuv"; > + else -> + filename > + (dev->_pixel_format = +> + filename = +> + (dev->_pixel_format == > + PIXEL_FRMT_411) ? "/root/pal411.yuv" : > + "/root/pal422.yuv"; > + } else diff --git a/a/content_digest b/N1/content_digest index 79cf001..6eea76c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01287341311-11161-2-git-send-email-julia@diku.dk\0" "From\0walter harms <wharms@bfs.de>\0" "Subject\0Re: [PATCH 1/3] drivers/staging/cx25821: Use kasprintf\0" - "Date\0Mon, 18 Oct 2010 07:15:19 +0000\0" + "Date\0Mon, 18 Oct 2010 09:15:19 +0200\0" "To\0Julia Lawall <julia@diku.dk>\0" "Cc\0kernel-janitors@vger.kernel.org" devel@driverdev.osuosl.org @@ -44,10 +44,11 @@ "> len = strlen(arg)\n" "> ... when != len = e1\n" "> when != arg = e2\n" - "> a > - \\(kmalloc\\|kzalloc\\)(len+1,flag)\n" + "> a =\n" + "> - \\(kmalloc\\|kzalloc\\)(len+1,flag)\n" "> + kasprintf(flag,\"%s\",arg)\n" "> <... when != a\n" - "> if (a = NULL || ...) S\n" + "> if (a == NULL || ...) S\n" "> ...>\n" "> - memcpy(a,arg,len+1);\n" "> // </smpl>\n" @@ -91,7 +92,7 @@ "> -\t\t str_length + 1);\n" "> -\n" "> -\t\t/* Default if filename is empty string */\n" - "> -\t\tif (strcmp(dev->input_audiofilename, \"\") = 0)\n" + "> -\t\tif (strcmp(dev->input_audiofilename, \"\") == 0)\n" "> -\t\t\tdev->_audiofilename = \"/root/audioGOOD.wav\";\n" "> -\n" "> -\t} else {\n" @@ -116,7 +117,7 @@ "\n" "Is filename needed here at all ?\n" "The if statement looks strange this looks more familar to me:\n" - "if (!dev->input_audiofilename || *dev->input_audiofilename=0)\n" + "if (!dev->input_audiofilename || *dev->input_audiofilename==0)\n" "\tfilename = _defaultAudioName;\n" "else\n" "\tfilename = dev->input_audiofilename;\n" @@ -125,7 +126,8 @@ " wh\n" "\n" "\n" - "> \tretval > @@ -802,5 +788,5 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)\n" + "> \tretval =\n" + "> @@ -802,5 +788,5 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)\n" "> error:\n" "> \tcx25821_dev_unregister(dev);\n" "> \n" @@ -172,24 +174,28 @@ "> -\t}\n" "> -\n" "> - /* Default if filename is empty string */\n" - "> -\tif (strcmp(dev->input_filename_ch2, \"\") = 0) {\n" + "> -\tif (strcmp(dev->input_filename_ch2, \"\") == 0) {\n" "> -\t\tif (dev->_isNTSC_ch2) {\n" - "> -\t\t\tdev->_filename_ch2 > -\t\t\t (dev->_pixel_format_ch2 =\n" + "> -\t\t\tdev->_filename_ch2 =\n" + "> -\t\t\t (dev->_pixel_format_ch2 ==\n" "> -\t\t\t PIXEL_FRMT_411) ? \"/root/vid411.yuv\" :\n" "> -\t\t\t \"/root/vidtest.yuv\";\n" "> -\t\t} else {\n" - "> -\t\t\tdev->_filename_ch2 > -\t\t\t (dev->_pixel_format_ch2 =\n" + "> -\t\t\tdev->_filename_ch2 =\n" + "> -\t\t\t (dev->_pixel_format_ch2 ==\n" "> -\t\t\t PIXEL_FRMT_411) ? \"/root/pal411.yuv\" :\n" "> -\t\t\t \"/root/pal422.yuv\";\n" "> -\t\t}\n" "> +\t\t/* Default if filename is empty string */\n" - "> +\t\tif (strcmp(dev->input_filename_ch2, \"\") = 0) {\n" + "> +\t\tif (strcmp(dev->input_filename_ch2, \"\") == 0) {\n" "> +\t\t\tif (dev->_isNTSC_ch2)\n" - "> +\t\t\t\tfilename > +\t\t\t\t\t(dev->_pixel_format_ch2 =\n" + "> +\t\t\t\tfilename =\n" + "> +\t\t\t\t\t(dev->_pixel_format_ch2 ==\n" "> +\t\t\t\t\tPIXEL_FRMT_411) ? \"/root/vid411.yuv\" :\n" "> +\t\t\t\t\t\"/root/vidtest.yuv\";\n" "> +\t\t\telse\n" - "> +\t\t\t\tfilename > +\t\t\t\t\t(dev->_pixel_format_ch2 =\n" + "> +\t\t\t\tfilename =\n" + "> +\t\t\t\t\t(dev->_pixel_format_ch2 ==\n" "> +\t\t\t\t\tPIXEL_FRMT_411) ? \"/root/pal411.yuv\" :\n" "> +\t\t\t\t\t\"/root/pal422.yuv\";\n" "> +\t\t} else\n" @@ -202,7 +208,8 @@ "> +\t\tgoto error;\n" "> \t}\n" "> \n" - "> \tretval > @@ -851,5 +838,5 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,\n" + "> \tretval =\n" + "> @@ -851,5 +838,5 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,\n" "> error:\n" "> \tcx25821_dev_unregister(dev);\n" "> \n" @@ -247,24 +254,28 @@ "> -\t}\n" "> -\n" "> -\t/* Default if filename is empty string */\n" - "> -\tif (strcmp(dev->input_filename, \"\") = 0) {\n" + "> -\tif (strcmp(dev->input_filename, \"\") == 0) {\n" "> -\t\tif (dev->_isNTSC) {\n" - "> -\t\t\tdev->_filename > -\t\t\t (dev->_pixel_format =\n" + "> -\t\t\tdev->_filename =\n" + "> -\t\t\t (dev->_pixel_format ==\n" "> -\t\t\t PIXEL_FRMT_411) ? \"/root/vid411.yuv\" :\n" "> -\t\t\t \"/root/vidtest.yuv\";\n" "> -\t\t} else {\n" - "> -\t\t\tdev->_filename > -\t\t\t (dev->_pixel_format =\n" + "> -\t\t\tdev->_filename =\n" + "> -\t\t\t (dev->_pixel_format ==\n" "> -\t\t\t PIXEL_FRMT_411) ? \"/root/pal411.yuv\" :\n" "> -\t\t\t \"/root/pal422.yuv\";\n" "> -\t\t}\n" "> +\t\t/* Default if filename is empty string */\n" - "> +\t\tif (strcmp(dev->input_filename, \"\") = 0) {\n" + "> +\t\tif (strcmp(dev->input_filename, \"\") == 0) {\n" "> +\t\t\tif (dev->_isNTSC)\n" - "> +\t\t\t\tfilename > +\t\t\t\t\t(dev->_pixel_format =\n" + "> +\t\t\t\tfilename =\n" + "> +\t\t\t\t\t(dev->_pixel_format ==\n" "> +\t\t\t\t\tPIXEL_FRMT_411) ? \"/root/vid411.yuv\" :\n" "> +\t\t\t\t\t\"/root/vidtest.yuv\";\n" "> +\t\t\telse\n" - "> +\t\t\t\tfilename > +\t\t\t\t\t(dev->_pixel_format =\n" + "> +\t\t\t\tfilename =\n" + "> +\t\t\t\t\t(dev->_pixel_format ==\n" "> +\t\t\t\t\tPIXEL_FRMT_411) ? \"/root/pal411.yuv\" :\n" "> +\t\t\t\t\t\"/root/pal422.yuv\";\n" "> +\t\t} else\n" @@ -294,4 +305,4 @@ "> \n" > -be1bf865589fcb3b88493f87b335eca38350c2d4be6368952eec9574bab4ffac +2d2b63cc41c9abad1be65853f672454fbc0e7274b2824ffc21d92949351850f0
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.