Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f4a1ec authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix google-runtime-int warnings."

parents 51dcd0da 54a2747e

applypatch/applypatch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ size_t FreeSpaceForFile(const char* filename) { 


int CacheSizeCheck(size_t bytes) {

    if (MakeFreeSpaceOnCache(bytes) < 0) {

        printf("unable to make %ld bytes available on /cache\n", (long)bytes);

        printf("unable to make %zu bytes available on /cache\n", bytes);

        return 1;

    } else {

        return 0;

applypatch/imgpatch.cpp

+2 −2
Original line number Diff line number Diff line
@@ -229,8 +229,8 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, 
                ssize_t have = temp_data.size() - strm.avail_out;



                if (sink(temp_data.data(), have, token) != have) {

                    printf("failed to write %ld compressed bytes to output\n",

                           (long)have);

                    printf("failed to write %zd compressed bytes to output\n",

                           have);

                    return -1;

                }

                if (ctx) SHA1_Update(ctx, temp_data.data(), have);

applypatch/utils.cpp

+10 −10
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ void Write4(int value, FILE* f) { 
}



/** Write an 8-byte value to f in little-endian order. */

void Write8(long long value, FILE* f) {

void Write8(int64_t value, FILE* f) {

  fputc(value & 0xff, f);

  fputc((value >> 8) & 0xff, f);

  fputc((value >> 16) & 0xff, f);
@@ -52,14 +52,14 @@ int Read4(void* pv) { 
                 (unsigned int)p[0]);

}



long long Read8(void* pv) {

int64_t Read8(void* pv) {

    unsigned char* p = reinterpret_cast<unsigned char*>(pv);

    return (long long)(((unsigned long long)p[7] << 56) |

                       ((unsigned long long)p[6] << 48) |

                       ((unsigned long long)p[5] << 40) |

                       ((unsigned long long)p[4] << 32) |

                       ((unsigned long long)p[3] << 24) |

                       ((unsigned long long)p[2] << 16) |

                       ((unsigned long long)p[1] << 8) |

                       (unsigned long long)p[0]);

    return (int64_t)(((uint64_t)p[7] << 56) |

                       ((uint64_t)p[6] << 48) |

                       ((uint64_t)p[5] << 40) |

                       ((uint64_t)p[4] << 32) |

                       ((uint64_t)p[3] << 24) |

                       ((uint64_t)p[2] << 16) |

                       ((uint64_t)p[1] << 8) |

                       (uint64_t)p[0]);

}

applypatch/utils.h

+3 −2
Original line number Diff line number Diff line
@@ -17,14 +17,15 @@ 
#ifndef _BUILD_TOOLS_APPLYPATCH_UTILS_H

#define _BUILD_TOOLS_APPLYPATCH_UTILS_H



#include <inttypes.h>

#include <stdio.h>



// Read and write little-endian values of various sizes.



void Write4(int value, FILE* f);

void Write8(long long value, FILE* f);

void Write8(int64_t value, FILE* f);

int Read2(void* p);

int Read4(void* p);

long long Read8(void* p);

int64_t Read8(void* p);



#endif //  _BUILD_TOOLS_APPLYPATCH_UTILS_H

edify/expr.cpp

+4 −3
Original line number Diff line number Diff line
@@ -286,13 +286,14 @@ Value* LessThanIntFn(const char* name, State* state, int argc, Expr* argv[]) { 
    bool result = false;

    char* end;



    long l_int = strtol(left, &end, 10);

    // Parse up to at least long long or 64-bit integers.

    int64_t l_int = static_cast<int64_t>(strtoll(left, &end, 10));

    if (left[0] == '\0' || *end != '\0') {

        goto done;

    }



    long r_int;

    r_int = strtol(right, &end, 10);

    int64_t r_int;

    r_int = static_cast<int64_t>(strtoll(right, &end, 10));

    if (right[0] == '\0' || *end != '\0') {

        goto done;

    }