diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-02-07 11:14:52 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-07 23:03:03 +0000 |
| commit | f966980937abd4899a9c43329041bb00798ab18e (patch) | |
| tree | e31210350fa778765b6d2d4711fc5cc6c27f2aae /reordercap.c | |
| parent | 217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff) | |
| download | wireshark-f966980937abd4899a9c43329041bb00798ab18e.tar.gz | |
Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.
Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'reordercap.c')
| -rw-r--r-- | reordercap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/reordercap.c b/reordercap.c index c7706aba03..57741e9cea 100644 --- a/reordercap.c +++ b/reordercap.c @@ -53,8 +53,8 @@ static void usage(gboolean is_error) } fprintf(output, "Reordercap %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n", VERSION); fprintf(output, "Reorder timestamps of input file frames into output file.\n"); @@ -98,10 +98,10 @@ frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh, Buffer *buf, gchar *err_info; struct wtap_pkthdr phdr; - DEBUG_PRINT("\nDumping frame (offset=%" G_GINT64_MODIFIER "u)\n", + DEBUG_PRINT("\nDumping frame (offset=%" G_GINT64_MODIFIER "u)\n", frame->offset); - + /* Re-read the first frame from the stored location */ if (!wtap_seek_read(wth, frame->offset, &phdr, buf, &err, &err_info)) { if (err != 0) { |