ALT Linux Team development discussions
 help / color / mirror / Atom feed
From: Aleksei Nikiforov <darktemplar@altlinux.org>
To: devel@lists.altlinux.org
Cc: Aleksei Nikiforov <darktemplar@altlinux.org>
Subject: [devel] [PATCH for apt v2 02/21] Use correct types and type specifiers
Date: Thu, 12 Dec 2019 12:57:11 +0300
Message-ID: <20191212095730.83787-3-darktemplar@altlinux.org> (raw)
In-Reply-To: <20191212095730.83787-1-darktemplar@altlinux.org>

Found via cppcheck:
(warning) %li in format string (no. 1) requires 'long'
but the argument type is 'unsigned long'.

(warning) %llu in format string (no. 1) requires 'unsigned long long'
but the argument type is 'signed long long'.

And other similar warnings
---
 apt/apt-pkg/contrib/cdromutl.cc | 4 ++--
 apt/apt-pkg/contrib/strutl.cc   | 8 ++++----
 apt/cmdline/acqprogress.cc      | 4 ++--
 apt/methods/connect.cc          | 4 ++--
 apt/methods/http.cc             | 9 +++------
 apt/methods/http.h              | 2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/apt/apt-pkg/contrib/cdromutl.cc b/apt/apt-pkg/contrib/cdromutl.cc
index 6101145..139be84 100644
--- a/apt/apt-pkg/contrib/cdromutl.cc
+++ b/apt/apt-pkg/contrib/cdromutl.cc
@@ -232,8 +232,8 @@ bool IdentCdrom(const string &CD,string &Res,unsigned int Version)
 	 return _error->Errno("statfs",_("Failed to stat the cdrom"));
       
       // We use a kilobyte block size to advoid overflow
-      sprintf(S,"%llu %llu",(long long)(Buf.f_blocks*(Buf.f_bsize/1024)),
-	      (long long)(Buf.f_bfree*(Buf.f_bsize/1024)));
+      sprintf(S,"%llu %llu",(unsigned long long)(Buf.f_blocks*(Buf.f_bsize/1024)),
+	      (unsigned long long)(Buf.f_bfree*(Buf.f_bsize/1024)));
       Hash.Add(S);
       sprintf(S,"-%u",Version);
    }
diff --git a/apt/apt-pkg/contrib/strutl.cc b/apt/apt-pkg/contrib/strutl.cc
index 6131d47..bde4ef5 100644
--- a/apt/apt-pkg/contrib/strutl.cc
+++ b/apt/apt-pkg/contrib/strutl.cc
@@ -292,23 +292,23 @@ string TimeToStr(unsigned long Sec)
    {
       if (Sec > 60*60*24)
       {
-	 sprintf(S,"%lid %lih%lim%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);
+	 sprintf(S,"%lud %luh%lum%lus",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);
 	 break;
       }
       
       if (Sec > 60*60)
       {
-	 sprintf(S,"%lih%lim%lis",Sec/60/60,(Sec/60) % 60,Sec % 60);
+	 sprintf(S,"%luh%lum%lus",Sec/60/60,(Sec/60) % 60,Sec % 60);
 	 break;
       }
       
       if (Sec > 60)
       {
-	 sprintf(S,"%lim%lis",Sec/60,Sec % 60);
+	 sprintf(S,"%lum%lus",Sec/60,Sec % 60);
 	 break;
       }
       
-      sprintf(S,"%lis",Sec);
+      sprintf(S,"%lus",Sec);
       break;
    }
    
diff --git a/apt/cmdline/acqprogress.cc b/apt/cmdline/acqprogress.cc
index 8fa9420..ecf9c2e 100644
--- a/apt/cmdline/acqprogress.cc
+++ b/apt/cmdline/acqprogress.cc
@@ -215,10 +215,10 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
       {
 	 if (Mode == Short)
 	    snprintf(S,End-S," %lu%%",
-		     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+		     (unsigned long) (double(I->CurrentSize*100.0)/double(I->TotalSize)));
 	 else
 	    snprintf(S,End-S,"/%sB %lu%%",SizeToStr(I->TotalSize).c_str(),
-		     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+		     (unsigned long) (double(I->CurrentSize*100.0)/double(I->TotalSize)));
       }      
       S += strlen(S);
       snprintf(S,End-S,"]");
diff --git a/apt/methods/connect.cc b/apt/methods/connect.cc
index f086a7e..a25d6b4 100644
--- a/apt/methods/connect.cc
+++ b/apt/methods/connect.cc
@@ -162,7 +162,7 @@ bool Connect(const string &Host,int Port,const char *Service,int DefPort,std::un
    // Convert the port name/number
    char ServStr[300];
    if (Port != 0)
-      snprintf(ServStr,sizeof(ServStr),"%u",Port);
+      snprintf(ServStr,sizeof(ServStr),"%u",(unsigned) Port);
    else
       snprintf(ServStr,sizeof(ServStr),"%s",Service);
    
@@ -198,7 +198,7 @@ bool Connect(const string &Host,int Port,const char *Service,int DefPort,std::un
 	    {
 	       if (DefPort != 0)
 	       {
-		  snprintf(ServStr,sizeof(ServStr),"%u",DefPort);
+		  snprintf(ServStr,sizeof(ServStr),"%u",(unsigned) DefPort);
 		  DefPort = 0;
 		  continue;
 	       }
diff --git a/apt/methods/http.cc b/apt/methods/http.cc
index da3e646..6d9a642 100644
--- a/apt/methods/http.cc
+++ b/apt/methods/http.cc
@@ -588,7 +588,7 @@ bool ServerState::HeaderLine(const string &Line)
       
       if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2)
 	 return _error->Error(_("The http server sent an invalid Content-Range header"));
-      if ((unsigned long long)StartPos > Size)
+      if (StartPos > Size)
 	 return _error->Error(_("This http server has broken range support"));
       return true;
    }
@@ -1016,11 +1016,8 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
    FailTime = Srv->Date;
       
    // Set the expected size
-   if (Srv->StartPos >= 0)
-   {
-      Res.ResumePoint = Srv->StartPos;
-      ftruncate(File->Fd(),Srv->StartPos);
-   }
+   Res.ResumePoint = Srv->StartPos;
+   ftruncate(File->Fd(),Srv->StartPos);
       
    // Set the start point
    lseek(File->Fd(),0,SEEK_END);
diff --git a/apt/methods/http.h b/apt/methods/http.h
index b5c2d68..3b50e73 100644
--- a/apt/methods/http.h
+++ b/apt/methods/http.h
@@ -87,7 +87,7 @@ struct ServerState
    
    // These are some statistics from the last parsed header lines
    unsigned long long Size;
-   signed long long StartPos;
+   unsigned long long StartPos;
    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
-- 
2.24.1



  parent reply	other threads:[~2019-12-12  9:57 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-10 15:23 [devel] [PATCH for apt 00/38] Various fixes for Apt and basic integration test suite Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 01/38] Replace post-increments with pre-increments Aleksei Nikiforov
2019-12-10 18:21   ` Alexey Tourbin
2019-12-11  7:51     ` Aleksei Nikiforov
2019-12-11  8:11       ` Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 02/38] Use correct types and type specifiers Aleksei Nikiforov
2019-12-10 22:45   ` Dmitry V. Levin
2019-12-11  7:56     ` Aleksei Nikiforov
2019-12-11 23:48       ` Dmitry V. Levin
2019-12-12  9:57         ` [devel] [PATCH for apt v2 00/21] Various fixes for Apt and basic integration test suite Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 01/21] Replace post-increments with pre-increments Aleksei Nikiforov
2019-12-12 21:32             ` Andrey Savchenko
2019-12-13  8:29               ` Aleksei Nikiforov
2019-12-13  9:11               ` [devel] [PATCH for apt v3 " Aleksei Nikiforov
2019-12-13  9:12               ` [devel] [PATCH for apt v4 09/21] Rework identical conditions Aleksei Nikiforov
2019-12-13  9:18               ` [devel] [PATCH for apt v4] Additional loops improvements and beautification Aleksei Nikiforov
2019-12-13  9:20                 ` Aleksei Nikiforov
2019-12-12  9:57           ` Aleksei Nikiforov [this message]
2019-12-12  9:57           ` [devel] [PATCH for apt v2 03/21] Fix potential memory corruption in pkgCache::DepIterator::AllTargets() Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 04/21] Get rid of nullptr dereference Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 05/21] Fix memory access outside of allocated buffer ranges Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 06/21] Get rid of hardcoded array size Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 07/21] Use signed types to detect IO errors Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 08/21] Use 'explicit' keyword for constructors with one argument Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 09/21] Rework identical conditions Aleksei Nikiforov
2019-12-12 19:55             ` Andrey Savchenko
2019-12-13  8:10               ` Aleksei Nikiforov
2019-12-13  8:21               ` [devel] [PATCH for apt v3 " Aleksei Nikiforov
2019-12-13  8:23               ` [devel] [PATCH for apt v3] DoList: optimize status modification loop Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 10/21] Improve member variable initialization Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 11/21] Remove useless variable shadowing Aleksei Nikiforov
2019-12-12 21:19             ` Andrey Savchenko
2019-12-12  9:57           ` [devel] [PATCH for apt v2 12/21] Fortify against buffer overflows Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 13/21] Cacheiterators: sanitize increment operators and end() function Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 14/21] Fix memory leaks Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 15/21] Fix incorrect delete operator Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 16/21] Don't access uninitialized data Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 17/21] Fix access after free error Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 18/21] Apt-pipe: ensure mainloop function doesn't return uninitialized or garbage value Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 19/21] Don't use uninitialized value Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 20/21] Get rid of dangling invalid pointer Aleksei Nikiforov
2019-12-12  9:57           ` [devel] [PATCH for apt v2 21/21] Fix invalid check of Queue against zero Aleksei Nikiforov
2019-12-12 19:08             ` Andrey Savchenko
2019-12-13  7:25               ` Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 03/38] Fix potential memory corruption in pkgCache::DepIterator::AllTargets() Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 04/38] Get rid of nullptr dereference Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 05/38] Fix memory access outside of allocated buffer ranges Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 06/38] Get rid of hardcoded array size Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 07/38] Use signed types to detect IO errors Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 08/38] Use 'explicit' keyword for constructors with one argument Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 09/38] Rework identical conditions Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 10/38] Improve member variable initialization Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 11/38] Remove useless variable shadowing Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 12/38] Fortify against buffer overflows Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 13/38] Cacheiterators: sanitize increment operators and end() function Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 14/38] Fix memory leaks Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 15/38] Fix incorrect delete operator Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 16/38] Don't access uninitialized data Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 17/38] Fix access after free error Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 18/38] Apt-pipe: ensure mainloop function doesn't return uninitialized or garbage value Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 19/38] Don't use uninitialized value Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 20/38] Get rid of dangling invalid pointer Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 21/38] Fix invalid check of Queue against zero Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 22/38] Fix iterators comparison Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 23/38] Fortify ParseQuoteWord function Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 24/38] Improve ipv6 address handling Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 25/38] Check subsecond modification time for cached files Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 26/38] Fix warning about truncation of value of pkgCache::Header::HeaderSz Aleksei Nikiforov
2019-12-10 22:57   ` Dmitry V. Levin
2019-12-11  7:51     ` Aleksei Nikiforov
2019-12-11 23:41       ` Dmitry V. Levin
2019-12-12  7:38         ` Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 27/38] FileFd: all files are closed automatically Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 28/38] Fix resource leaks in pkgCacheFile class Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 29/38] Fix off by one error in dynamic mmap leading to resource leak Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 30/38] pkgCacheFile: call Close() function in destructor Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 31/38] pkgCacheFile: don't regenerate cache if it was already built Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 32/38] Add support for rpm's dbpath configuration Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 33/38] Import integration tests framework from Debian Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 34/38] Add initial integration tests Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 35/38] Add basic tests to ensure that lua and rpm scripts are called Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 36/38] Add http and https methods tests Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 37/38] Enable integration test suite during package build Aleksei Nikiforov
2019-12-10 15:23 ` [devel] [PATCH for apt 38/38] Add code coverage support Aleksei Nikiforov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191212095730.83787-3-darktemplar@altlinux.org \
    --to=darktemplar@altlinux.org \
    --cc=devel@lists.altlinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git