d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move zlib.c from net to libkern.

Browse Source 
It is not network-specific code and would
be better as part of libkern instead.
Move zlib.h and zutil.h from net/ to sys/
Update includes to use sys/zlib.h and sys/zutil.h instead of net/

Submitted by:		Steve Kiernan stevek@juniper.net
Obtained from:		Juniper Networks, Inc.
GitHub Pull Request:	https://github.com/freebsd/freebsd/pull/28
Relnotes:		yes
This commit is contained in:
Craig Rodrigues 2015-04-22 14:38:58 +00:00
parent e19e678123
commit d9db52256e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=281855
14 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/conf/files
View File

@ -3262,6 +3262,9 @@ libkern/strtoul.c standard
libkern/strtouq.c standard
libkern/strvalid.c standard
libkern/timingsafe_bcmp.c standard
libkern/zlib.c optional crypto | geom_uzip | ipsec | \
mxge | netgraph_deflate | \
ddb_ctf | gzio | geom_uncompress
net/altq/altq_cbq.c optional altq
net/altq/altq_cdnr.c optional altq
net/altq/altq_hfsc.c optional altq
@ -3324,9 +3327,6 @@ net/slcompress.c optional netgraph_vjc | sppp | \
netgraph_sppp
net/toeplitz.c optional inet rss | inet6 rss
net/vnet.c optional vimage
net/zlib.c optional crypto | geom_uzip | ipsec | \
mxge | netgraph_deflate | \
ddb_ctf | gzio | geom_uncompress
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan wlan_acl
net80211/ieee80211_action.c optional wlan

2
sys/dev/bxe/bxe.h
View File

@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include <sys/limits.h>
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/zlib.h>
#include <net/if.h>
#include <net/if_types.h>
@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_media.h>
#include <net/if_vlan_var.h>
#include <net/zlib.h>
#include <net/bpf.h>
#include <netinet/in.h>

2
sys/dev/mxge/if_mxge.c
View File

@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/sx.h>
#include <sys/taskqueue.h>
#include <sys/zlib.h>
#include <net/if.h>
#include <net/if_var.h>
@ -58,7 +59,6 @@ __FBSDID("$FreeBSD$");
#include <net/if_types.h>
#include <net/if_vlan_var.h>
#include <net/zlib.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>

2
sys/geom/uncompress/g_uncompress.c
View File

@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/zlib.h>
#include <geom/geom.h>
#include <net/zlib.h>
#include <contrib/xz-embedded/linux/include/linux/xz.h>
#ifdef GEOM_UNCOMPRESS_DEBUG

2
sys/geom/uzip/g_uzip.c
View File

@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/zlib.h>
#include <geom/geom.h>
#include <net/zlib.h>
FEATURE(geom_uzip, "GEOM uzip read-only compressed disks support");

3
sys/kern/kern_gzio.c
View File

@ -32,8 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/gzio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <net/zutil.h>
#include <sys/zutil.h>
#define KERN_GZ_HDRLEN 10 /* gzip header length */
#define KERN_GZ_TRAILERLEN 8 /* gzip trailer length */

2
sys/kern/link_elf.c
View File

@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
#include <sys/link_elf.h>
#ifdef DDB_CTF
#include <net/zlib.h>
#include <sys/zlib.h>
#endif
#include "linker_if.h"

2
sys/kern/link_elf_obj.c
View File

@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
#include <sys/link_elf.h>
#ifdef DDB_CTF
#include <net/zlib.h>
#include <sys/zlib.h>
#endif
#include "linker_if.h"

2
sys/net/zlib.c → sys/libkern/zlib.c
View File

@ -54,7 +54,7 @@
#define _Z_UTIL_H
#ifdef _KERNEL
#include <net/zlib.h>
#include <sys/zlib.h>
#else
#include "zlib.h"
#endif

3
sys/netgraph/ng_deflate.c
View File

@ -39,8 +39,7 @@
#include <sys/endian.h>
#include <sys/errno.h>
#include <sys/syslog.h>
#include <net/zlib.h>
#include <sys/zlib.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>

4
sys/opencrypto/cryptodeflate.c
View File

@ -29,7 +29,7 @@
/*
* This file contains a wrapper around the deflate algo compression
* functions using the zlib library (see net/zlib.{c,h})
* functions using the zlib library (see libkern/zlib.c and sys/zlib.h})
*/
#include <sys/cdefs.h>
@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/sdt.h>
#include <sys/systm.h>
#include <net/zlib.h>
#include <sys/zlib.h>
#include <opencrypto/cryptodev.h>
#include <opencrypto/deflate.h>

2
sys/opencrypto/deflate.h
View File

@ -36,7 +36,7 @@
#ifndef _CRYPTO_DEFLATE_H_
#define _CRYPTO_DEFLATE_H_
#include <net/zlib.h>
#include <sys/zlib.h>
#define Z_METHOD 8
#define Z_MEMLEVEL 8

0
sys/net/zlib.h → sys/sys/zlib.h
View File

2
sys/net/zutil.h → sys/sys/zutil.h
View File

@ -17,7 +17,7 @@
#define ZEXPORT
#ifdef _KERNEL
#include <net/zlib.h>
#include <sys/zlib.h>
#else
#include "zlib.h"
#endif