Wireshark - 0.99.7 Guide de l'utilisateur télécharger pdf (Page 48)

temporary files which might be otherwise included in the diff. After doing the diff, you should edit

the foo.diff file and remove unnecessary things, like your private changes to the con-

fig.nmake file.

Table 3.1. Some useful diff options

Option Purpose

-N Add new files when used in conjuction with -r.

-r Recursively compare any subdirectories found.

-u Output unified context.

--strip-trailing-cr Strip trailing carriage return on input. This is

useful for Win32

-x PAT Exclude files that match PAT. This could be

something like -x *.obj to exclude all win32 ob-

ject files.

The diff tool has a lot options; they can be listed with:

diff --help

3.9.3. Some tips for a good patch

Some tips that will make the merging of your changes into the SVN tree much more likely (and you

want exactly that, don't you :-):

• Use the latest SVN sources, or alike. It's a good idea to work with the same sources that are

used by the other developer's, this makes it usually much easier to apply your patch. For inform-

ation about the different ways to get the sources, see Section 3.3, “Obtain the Wireshark

sources”.

• Update your SVN sources just before making a patch. For the same reasons as the previous

point.

• Do a "make clean" before generating the patch. This removes a lot of unneeded intermediate

files (like object files) which can confuse the diff tool generating a lot of unneeded stuff which

you have to remove by hand from the patch again.

• Find a good descriptive filename for your patch. Think a moment to find a proper name for

your patch file. Often a filename like wireshark.diff is used, which isn't really helpful if

keeping several of these files and find the right one later. For example: If you want to commit

changes to the datatypes of dissector foo, a good filename might be: packet-

foo-datatypes.diff.

• Don't put unrelated things into one large patch. A few smaller patches are usually easier to

apply (but also don't put every changed line into a separate patch :-).

• Remove any parts of the patch not related to the changes you want to submit. You can use a

text editor for this. A common example for win32 developers are the differences in your private

config.nmake file.

In general: making it easier to understand and apply your patch by one of the maintainers will make

it much more likely (and faster) that it will actually be applied.

Please remember: you don't pay the person "on the other side of the mail" for his/her effort applying

your patch!

3.9.4. Code Requirements

Work with the Wireshark sources

1 2 ... 43 44 45 46 47 48 49 50 51 52 53 ... 146 147

Pas de commentaire

Wireshark - 0.99.7 Guide de l'utilisateur Page 48