Return-Path: X-Original-To: apmail-mynewt-commits-archive@minotaur.apache.org Delivered-To: apmail-mynewt-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BECBA192E4 for ; Thu, 7 Apr 2016 07:11:47 +0000 (UTC) Received: (qmail 57684 invoked by uid 500); 7 Apr 2016 07:11:47 -0000 Delivered-To: apmail-mynewt-commits-archive@mynewt.apache.org Received: (qmail 57652 invoked by uid 500); 7 Apr 2016 07:11:47 -0000 Mailing-List: contact commits-help@mynewt.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mynewt.incubator.apache.org Delivered-To: mailing list commits@mynewt.incubator.apache.org Received: (qmail 57643 invoked by uid 99); 7 Apr 2016 07:11:47 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 07:11:47 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 209B8C0F67 for ; Thu, 7 Apr 2016 07:11:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.216 X-Spam-Level: X-Spam-Status: No, score=-4.216 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.996] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id h9eZPPsmc-yL for ; Thu, 7 Apr 2016 07:11:45 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 1052E5FB3F for ; Thu, 7 Apr 2016 07:11:44 +0000 (UTC) Received: (qmail 57623 invoked by uid 99); 7 Apr 2016 07:11:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 07:11:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D66D0E050B; Thu, 7 Apr 2016 07:11:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wes3@apache.org To: commits@mynewt.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-mynewt-core git commit: Fix error in le64toh Date: Thu, 7 Apr 2016 07:11:43 +0000 (UTC) Repository: incubator-mynewt-core Updated Branches: refs/heads/develop fbc310f6e -> 1b91ac5e5 Fix error in le64toh Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/1b91ac5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/1b91ac5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/1b91ac5e Branch: refs/heads/develop Commit: 1b91ac5e5d97717d9c3c68dfbe0127043d253394 Parents: fbc310f Author: William San Filippo Authored: Thu Apr 7 00:11:21 2016 -0700 Committer: William San Filippo Committed: Thu Apr 7 00:11:21 2016 -0700 ---------------------------------------------------------------------- net/nimble/src/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/1b91ac5e/net/nimble/src/util.c ---------------------------------------------------------------------- diff --git a/net/nimble/src/util.c b/net/nimble/src/util.c index 8d105d4..c6f2a43 100644 --- a/net/nimble/src/util.c +++ b/net/nimble/src/util.c @@ -6,7 +6,7 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, @@ -99,7 +99,7 @@ le64toh(void *buf) x |= (uint64_t)u8ptr[4] << 32; x |= (uint64_t)u8ptr[5] << 40; x |= (uint64_t)u8ptr[6] << 48; - x |= (uint64_t)u8ptr[7] << 54; + x |= (uint64_t)u8ptr[7] << 56; return x; }