← Back to branch summary

~ubuntu-branches/ubuntu/utopic/coreutils/utopic-proposed

« back to all changes in this revision

Viewing changes to src/join.c

  • Committer: Colin Watson
  • Date: 2013-10-30 15:48:33 UTC
  • mfrom: (8.3.5 sid)
  • Revision ID: cjwatson@canonical.com-20131030154833-xdt6e1yfffqom1c4
merge from Debian 8.21-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/join.c
1
1
/* join - join lines of two files on a common field
2
 
   Copyright (C) 1991-2012 Free Software Foundation, Inc.
 
2
   Copyright (C) 1991-2013 Free Software Foundation, Inc.
3
3
 
4
4
   This program is free software: you can redistribute it and/or modify
5
5
   it under the terms of the GNU General Public License as published by
400
400
 
401
401
              error ((check_input_order == CHECK_ORDER_ENABLED
402
402
                      ? EXIT_FAILURE : 0),
403
 
                     0, _("%s:%ju: is not sorted: %.*s"),
 
403
                     0, _("%s:%"PRIuMAX": is not sorted: %.*s"),
404
404
                     g_names[whatfile - 1], line_no[whatfile - 1],
405
405
                     (int) len, current->buf.buffer);
406
406