Diff of /src/filetypes.c [db140b] .. [0998f1] Maximize Restore

  Switch to side-by-side view

--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -674,7 +674,7 @@
 {
 	gchar *f;
 
-	g_return_if_fail(NZV(doc->real_path));
+	g_return_if_fail(!EMPTY(doc->real_path));
 
 	f = g_build_filename(app->configdir, "filetype_extensions.conf", NULL);
 	if (utils_str_equal(doc->real_path, f))
@@ -1216,7 +1216,7 @@
 		SETPTR(filetypes[ft_id]->comment_single, result);
 	}
 	/* import correctly filetypes that use old-style single comments */
-	else if (! NZV(filetypes[ft_id]->comment_close))
+	else if (EMPTY(filetypes[ft_id]->comment_close))
 	{
 		SETPTR(filetypes[ft_id]->comment_single, filetypes[ft_id]->comment_open);
 		filetypes[ft_id]->comment_open = NULL;
@@ -1529,7 +1529,7 @@
 {
 	GeanyFiletype *ft;
 
-	g_return_val_if_fail(NZV(name), NULL);
+	g_return_val_if_fail(!EMPTY(name), NULL);
 
 	ft = g_hash_table_lookup(filetypes_hash, name);
 	if (G_UNLIKELY(ft == NULL))
@@ -1577,7 +1577,7 @@
 	*filename = NULL;
 	*line = -1;
 
-	if (G_UNLIKELY(! NZV(regstr)))
+	if (G_UNLIKELY(EMPTY(regstr)))
 		return FALSE;
 
 	if (!ft->priv->error_regex || regstr != ft->priv->last_error_pattern)
@@ -1803,7 +1803,7 @@
 	if (single_first)
 	{
 		*co = ft->comment_single;
-		if (NZV(*co))
+		if (!EMPTY(*co))
 			*cc = NULL;
 		else
 		{
@@ -1814,7 +1814,7 @@
 	else
 	{
 		*co = ft->comment_open;
-		if (NZV(*co))
+		if (!EMPTY(*co))
 			*cc = ft->comment_close;
 		else
 		{
@@ -1823,5 +1823,5 @@
 		}
 	}
 
-	return NZV(*co);
-}
+	return !EMPTY(*co);
+}