From bd1b7f315e9338e1075136dda955a1790493ed6c Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Fri, 10 Nov 2017 04:52:24 +0000
Subject: Minor fixes

---
 src/http.c      | 17 +++++++++--------
 src/main.c      |  2 --
 src/po.c        |  9 ++++-----
 src/wyslij-po.h |  2 --
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/http.c b/src/http.c
index 0ce0ed0..35d09bb 100644
--- a/src/http.c
+++ b/src/http.c
@@ -127,9 +127,10 @@ create_project_url (const char *project,  struct obstack *pstk,
   const char *env[3] = { "domain", project, NULL };
 
   ws.ws_env = env;
-  if (mu_wordsplit (tp_url, &ws,
-		    MU_WRDSF_NOCMD | MU_WRDSF_UNDEF |
-		    MU_WRDSF_ENV | MU_WRDSF_ENV_KV | MU_WRDSF_NOSPLIT))
+  rc = mu_wordsplit (tp_url, &ws,
+		     MU_WRDSF_NOCMD | MU_WRDSF_UNDEF |
+		     MU_WRDSF_ENV | MU_WRDSF_ENV_KV | MU_WRDSF_NOSPLIT);
+  if (rc)
     {
       mu_error (_("cannot expand string `%s': %s"), tp_url,
 		mu_wordsplit_strerror (&ws));
@@ -140,7 +141,7 @@ create_project_url (const char *project,  struct obstack *pstk,
   if (rc)
     {
       mu_error (_("Cannot create url from `%s': %s"),
-		ws.ws_wordv, mu_strerror (rc));
+		ws.ws_wordv[0], mu_strerror (rc));
       mu_wordsplit_free (&ws);
       return 1;
     }
@@ -172,7 +173,7 @@ read_project_page (const char *project, struct obstack *pstk)
   cmd = obstack_s_expand (pstk, "GET %s HTTP/1.0\r\n\r\n", path);
 
   if (verbose > 2)
-    mu_printf (_("Connecting to %s:%ld\n"), host, port);
+    mu_printf (_("Connecting to %s:%u\n"), host, port);
   
   ret = mu_tcp_stream_create (&stream, host, port, MU_STREAM_NONBLOCK);
   if (ret != 0 && !(ret == EAGAIN || ret == EINPROGRESS))
@@ -293,14 +294,14 @@ http_ok (const char *text)
     }
   
   if (memcmp (text, "HTTP/", 5)
-      || !isdigit (text[5]) || text[6] != '.' || !isdigit (text[7])
-      || !ISHSPACE (text[8]))
+      || !mu_isdigit (text[5]) || text[6] != '.' || !mu_isdigit (text[7])
+      || !mu_isblank (text[8]))
     {
       mu_error (_("Invalid HTTP response (got %*.*s)"), 8, 8, text);
       return 1;
     }
   for (text += 8; *text; text++)
-    if (!ISHSPACE (*text))
+    if (!mu_isblank (*text))
       break;
 
   if (*text == 0)
diff --git a/src/main.c b/src/main.c
index 156c640..d84fed6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -289,8 +289,6 @@ wyslij_po (const char *name)
   char *po_sender;
   char *poname = restore_file_name (name, &po_sender);
   char *s;
-  char buf[512];
-  size_t n;
   
   if (verbose)
     mu_printf ("%s: %s\n", name, poname);
diff --git a/src/po.c b/src/po.c
index 7c8b463..4072abd 100644
--- a/src/po.c
+++ b/src/po.c
@@ -22,7 +22,7 @@ mu_header_t header;
 struct po_file
 {
   const char *name;
-  size_t line;
+  unsigned line;
   FILE *fp;
   char buf[1024];
   int level;
@@ -51,7 +51,7 @@ po_at_empty_line (struct po_file *file)
 {
   if (file->level == 0)
     po_fill_buf (file);
-  return isspace (*file->curp) || *file->curp == '#';
+  return mu_isspace (*file->curp) || *file->curp == '#';
 }
 
 void
@@ -219,7 +219,7 @@ po_header (const char *name)
       if (buf[len - 1] == '\n')
 	buf[--len] = 0;
       
-      for (p = buf; *p && ISHSPACE (*p); p++, len--)
+      for (p = buf; *p && mu_isblank (*p); p++, len--)
 	;
       if (*p == 0)
 	break;
@@ -348,7 +348,6 @@ restore_file_name (const char *file_name, char **pemail)
   const char *lang_team;
   const char *langcode;
   struct mu_wordsplit ws;
-  size_t size;
   char *name;
   int status;
   
@@ -436,7 +435,7 @@ int
 parse_lang_datafile (const char *name)
 {
   int status;
-  size_t line = 0;
+  unsigned line = 0;
   mu_stream_t instream;
   char *buf = NULL;
   size_t bufsize = 0, n;
diff --git a/src/wyslij-po.h b/src/wyslij-po.h
index 1dbac90..71f879d 100644
--- a/src/wyslij-po.h
+++ b/src/wyslij-po.h
@@ -36,8 +36,6 @@
 #define VERIFY_PO_TIME         0x01
 #define VERIFY_PACKAGE_VERSION 0x02
 
-#define ISHSPACE(c) ((c) == ' ' || (c) == '\t')
-
 extern char *tp_url;
 extern char *pot_regex_str;
 extern int verify_mask;
-- 
cgit v1.2.1