libutils cleanup: remove unused or seldom used code from misc.{cpp|h} (53095e25) · Commits · e / os / android_frameworks_native

include/utils/misc.h

+1 −39

Original line number	Diff line number	Diff line
		@@ -23,41 +23,12 @@
		#include <sys/time.h>
		#include <utils/Endian.h>

		namespace android {

		/* get #of elements in a static array */
		#ifndef NELEM
		# define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
		#endif

		/*
		* Make a copy of the string, using "new[]" instead of "malloc". Free the
		* string with delete[].
		*
		* Returns NULL if "str" is NULL.
		*/
		char* strdupNew(const char* str);

		/*
		* Concatenate an argument vector into a single string. If argc is >= 0
		* it will be used; if it's < 0 then the last element in the arg vector
		* must be NULL.
		*
		* This inserts a space between each argument.
		*
		* This does not automatically add double quotes around arguments with
		* spaces in them. This practice is necessary for Win32, because Win32's
		* CreateProcess call is stupid.
		*
		* The caller should delete[] the returned string.
		*/
		char* concatArgv(int argc, const char* const argv[]);

		/*
		* Count up the number of arguments in "argv". The count does not include
		* the final NULL entry.
		*/
		int countArgv(const char* const argv[]);
		namespace android {

		/*
		* Some utility functions for working with files. These could be made
		@@ -79,15 +50,6 @@ FileType getFileType(const char* fileName);
		/* get the file's modification date; returns -1 w/errno set on failure */
		time_t getFileModDate(const char* fileName);

		/*
		* Round up to the nearest power of 2. Handy for hash tables.
		*/
		unsigned int roundUpPower2(unsigned int val);

		void strreverse(char* begin, char* end);
		void k_itoa(int value, char* str, int base);
		char* itoa(int val, int base);

		typedef void (*sysprop_change_callback)(void);
		void add_sysprop_change_callback(sysprop_change_callback cb, int priority);
		void report_sysprop_change();

libs/utils/ZipFileRO.cpp

+19 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,25 @@ bool ZipFileRO::mapCentralDirectory(void)
		return true;
		}


		/*
		* Round up to the next highest power of 2.
		*
		* Found on http://graphics.stanford.edu/~seander/bithacks.html.
		*/
		static unsigned int roundUpPower2(unsigned int val)
		{
		val--;
		val \|= val >> 1;
		val \|= val >> 2;
		val \|= val >> 4;
		val \|= val >> 8;
		val \|= val >> 16;
		val++;

		return val;
		}

		bool ZipFileRO::parseZipArchive(void)
		{
		bool result = false;

libs/utils/misc.cpp

+0 −102

Original line number	Diff line number	Diff line
		@@ -38,90 +38,6 @@ using namespace android;

		namespace android {

		/*
		* Like strdup(), but uses C++ "new" operator instead of malloc.
		*/
		char* strdupNew(const char* str)
		{
		char* newStr;
		int len;

		if (str == NULL)
		return NULL;

		len = strlen(str);
		newStr = new char[len+1];
		memcpy(newStr, str, len+1);

		return newStr;
		}

		/*
		* Concatenate an argument vector.
		*/
		char* concatArgv(int argc, const char* const argv[])
		{
		char* newStr = NULL;
		int len, totalLen, posn, idx;

		/*
		* First, figure out the total length.
		*/
		totalLen = idx = 0;
		while (1) {
		if (idx == argc \|\| argv[idx] == NULL)
		break;
		if (idx)
		totalLen++; // leave a space between args
		totalLen += strlen(argv[idx]);
		idx++;
		}

		/*
		* Alloc the string.
		*/
		newStr = new char[totalLen +1];
		if (newStr == NULL)
		return NULL;

		/*
		* Finally, allocate the string and copy data over.
		*/
		idx = posn = 0;
		while (1) {
		if (idx == argc \|\| argv[idx] == NULL)
		break;
		if (idx)
		newStr[posn++] = ' ';

		len = strlen(argv[idx]);
		memcpy(&newStr[posn], argv[idx], len);
		posn += len;

		idx++;
		}

		assert(posn == totalLen);
		newStr[posn] = '\0';

		return newStr;
		}

		/*
		* Count the #of args in an argument vector. Don't count the final NULL.
		*/
		int countArgv(const char* const argv[])
		{
		int count = 0;

		while (argv[count] != NULL)
		count++;

		return count;
		}


		#include <stdio.h>
		/*
		* Get a file's type.
		*/
		@@ -172,24 +88,6 @@ time_t getFileModDate(const char* fileName)
		return sb.st_mtime;
		}

		/*
		* Round up to the next highest power of 2.
		*
		* Found on http://graphics.stanford.edu/~seander/bithacks.html.
		*/
		unsigned int roundUpPower2(unsigned int val)
		{
		val--;
		val \|= val >> 1;
		val \|= val >> 2;
		val \|= val >> 4;
		val \|= val >> 8;
		val \|= val >> 16;
		val++;

		return val;
		}

		struct sysprop_change_callback_info {
		sysprop_change_callback callback;
		int priority;