mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-27 08:00:11 +00:00
Code Issues Releases Activity

diff: Sort headers.

Browse Source 
MFC after:	1 week
Sponsored by:	Klara, Inc.
Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D45078
This commit is contained in:
Dag-Erling Smørgrav 2024-05-03 17:03:06 +02:00
parent 0549218b43
commit eea5f8d408
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/diff/diff.c
View File

@ -26,11 +26,11 @@
#include <err.h>
#include <errno.h>
#include <getopt.h>
#include <stdlib.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <limits.h>
#include "diff.h"
#include "xmalloc.h"

2
usr.bin/diff/diffdir.c
View File

@ -26,10 +26,10 @@
#include <err.h>
#include <errno.h>
#include <fnmatch.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <unistd.h>
#include "diff.h"

14
usr.bin/diff/diffreg_new.c
View File

@ -15,20 +15,22 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/capsicum.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/capsicum.h>
#ifndef DIFF_NO_MMAP
#include <sys/mman.h>
#endif
#include <sys/stat.h>
#include <capsicum_helpers.h>
#include <err.h>
#include <fcntl.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <time.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include "diff.h"
@ -266,10 +268,12 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum)
diff_result_free(result);
diff_data_free(&left);
diff_data_free(&right);
#ifndef DIFF_NO_MMAP
if (str1)
munmap(str1, st1.st_size);
if (str2)
munmap(str2, st2.st_size);
#endif
fclose(f1);
fclose(f2);