diff --git a/mozilla/xpcom/components/nsRepository.cpp b/mozilla/xpcom/components/nsRepository.cpp
index ab3277737e4..40d27e1202b 100644
--- a/mozilla/xpcom/components/nsRepository.cpp
+++ b/mozilla/xpcom/components/nsRepository.cpp
@@ -710,7 +710,7 @@ nsresult nsRepository::SyncComponentsInPathList(const char *pathlist)
 {
 	char *paths = PL_strdup(pathlist);
 
-	if (paths == NULL || *paths == NULL)
+	if (paths == NULL || *paths == '\0')
 		return(NS_ERROR_FAILURE);
 
 	char *pathsMem = paths;
@@ -735,7 +735,7 @@ nsresult nsRepository::SyncComponentsInDir(const char *dir)
 	// the filename each time in the loop
 	char fullname[NS_MAX_FILENAME_LEN];
 	PL_strncpyz(fullname, dir, sizeof(fullname));
-	int n = strlen(fullname);
+	unsigned int n = strlen(fullname);
 	if (n+1 < sizeof(fullname))
 	{
 		fullname[n] = PR_GetDirectorySeparator();
diff --git a/mozilla/xpcom/src/nsRepository.cpp b/mozilla/xpcom/src/nsRepository.cpp
index ab3277737e4..40d27e1202b 100644
--- a/mozilla/xpcom/src/nsRepository.cpp
+++ b/mozilla/xpcom/src/nsRepository.cpp
@@ -710,7 +710,7 @@ nsresult nsRepository::SyncComponentsInPathList(const char *pathlist)
 {
 	char *paths = PL_strdup(pathlist);
 
-	if (paths == NULL || *paths == NULL)
+	if (paths == NULL || *paths == '\0')
 		return(NS_ERROR_FAILURE);
 
 	char *pathsMem = paths;
@@ -735,7 +735,7 @@ nsresult nsRepository::SyncComponentsInDir(const char *dir)
 	// the filename each time in the loop
 	char fullname[NS_MAX_FILENAME_LEN];
 	PL_strncpyz(fullname, dir, sizeof(fullname));
-	int n = strlen(fullname);
+	unsigned int n = strlen(fullname);
 	if (n+1 < sizeof(fullname))
 	{
 		fullname[n] = PR_GetDirectorySeparator();