get rid of native_handle_{dup|copy} since they were not used any longer (8cd81ab3) · Commits · e / os / android_system_core

include/cutils/native_handle.h

+0 −26

Original line number	Diff line number	Diff line
		@@ -30,23 +30,6 @@ typedef struct
		} native_handle;


		/*
		* native_handle_dup
		*
		* duplicates a native handle. All source file descriptors are dup()'ed.
		*
		* lhs.numFds must be 0 or match rhs.numFds
		* lhs.numInts must be 0 or match rhs.numInts
		*
		* if lhs.numFds and lhs.numInts are set to 0, they are the only fields
		* updated, this can be used to figure out the size needed for copying rhs.
		*
		* return 0 on success, or a negative error code on failure
		*
		*/
		int native_handle_dup(native_handle* lhs, native_handle const* rhs);


		/*
		* native_handle_close
		*
		@@ -80,15 +63,6 @@ native_handle* native_handle_create(int numFds, int numInts);
		int native_handle_delete(native_handle* h);


		/*
		* native_handle_copy
		*
		* makes a deep copy of rhs. If rhs is null, returns null.
		*
		*/
		native_handle* native_handle_copy(const native_handle* rhs);


		__END_DECLS

		#endif /* NATIVE_HANDLE_H_ */

+0 −44

Original line number	Diff line number	Diff line
		@@ -46,37 +46,6 @@ int native_handle_delete(native_handle* h)
		return 0;
		}

		int native_handle_dup(native_handle* lhs, native_handle const* rhs)
		{
		if (rhs->version != sizeof(native_handle))
		return -EINVAL;

		if (lhs->version != sizeof(native_handle))
		return -EINVAL;

		const int numFds = rhs->numFds;
		const int numInts = rhs->numInts;

		if (lhs->numFds == 0 && lhs->numInts == 0) {
		lhs->numFds = numFds;
		lhs->numInts = numInts;
		return 0;
		}

		if (lhs->numFds != numFds)
		return -EINVAL;

		if (lhs->numInts != numInts)
		return -EINVAL;

		int i;
		for (i=0 ; i<numFds ; i++) {
		lhs->data[i] = dup( rhs->data[i] );
		}
		memcpy(&lhs->data[i], &rhs->data[i], numInts*sizeof(int));
		return 0;
		}

		int native_handle_close(const native_handle* h)
		{
		if (h->version != sizeof(native_handle))
		@@ -89,16 +58,3 @@ int native_handle_close(const native_handle* h)
		}
		return 0;
		}

		native_handle* native_handle_copy(const native_handle* rhs)
		{
		if (rhs == 0)
		return 0;

		native_handle* lhs = native_handle_create(rhs->numFds, rhs->numInts);
		if (native_handle_dup(lhs, rhs) < 0) {
		native_handle_delete(lhs);
		lhs = 0;
		}
		return lhs;
		}