mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 21:35:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Discovery phase: fix a few warnings

Browse source
This commit is contained in:
Olivier Goffart 2015-01-20 18:49:49 +01:00
parent 906779c4b1
commit 5c2298fa37
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libsync/discoveryphase.cpp
View file

@ -222,7 +222,7 @@ static csync_vio_file_stat_t* propertyMapToFileStat(QMap<QString,QString> map)
file_stat->remotePerm[0] = ' ';
// see _csync_detect_update()
file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_PERM;
} else if (value.length() < sizeof(file_stat->remotePerm)) {
} else if (value.length() < int(sizeof(file_stat->remotePerm))) {
strncpy(file_stat->remotePerm, value.toUtf8(), sizeof(file_stat->remotePerm));
file_stat->fields |= CSYNC_VIO_FILE_STAT_FIELDS_PERM;
} else {
@ -291,7 +291,7 @@ void DiscoverySingleDirectoryJob::lsJobFinishedWithErrorSlot(QNetworkReply *r)
deleteLater();
}
void DiscoveryMainThread::setupHooks(CSYNC *ctx, DiscoveryJob *discoveryJob, QString pathPrefix)
void DiscoveryMainThread::setupHooks(DiscoveryJob *discoveryJob, const QString &pathPrefix)
{
qDebug() << Q_FUNC_INFO;
_discoveryJob = discoveryJob;

8
src/libsync/discoveryphase.h
View file

@ -34,12 +34,12 @@ class Account;
* if the files are new, or changed.
*/
typedef struct {
struct DiscoveryDirectoryResult {
QString msg;
int code;
QLinkedList<csync_vio_file_stat_t*>::iterator iterator;
QLinkedList<csync_vio_file_stat_t *> list;
} DiscoveryDirectoryResult;
};
// Run in the main thread, reporting to the DiscoveryJobMainThread object
class DiscoverySingleDirectoryJob : public QObject {
@ -74,12 +74,12 @@ class DiscoveryMainThread : public QObject {
// If it is not in this map it needs to be requested
QMap<QString, QLinkedList<csync_vio_file_stat_t*> > _directoryContents;
DiscoveryDirectoryResult *_currentDiscoveryDirectoryResult;
QPointer<DiscoveryJob> _discoveryJob;
QPointer<DiscoverySingleDirectoryJob> _singleDirJob;
QString _pathPrefix;
AccountPtr _account;
DiscoveryDirectoryResult *_currentDiscoveryDirectoryResult;
public:
DiscoveryMainThread(AccountPtr account) : QObject(), _account(account), _currentDiscoveryDirectoryResult(0) {
@ -100,7 +100,7 @@ public slots:
void singleDirectoryJobFinishedWithErrorSlot(int csyncErrnoCode, QString msg);
void singleDirectoryJobFirstDirectoryPermissionsSlot(QString);
public:
void setupHooks(CSYNC *ctx, DiscoveryJob *discoveryJob, QString pathPrefix);
void setupHooks(DiscoveryJob* discoveryJob, const QString &pathPrefix);
};

2
src/libsync/syncengine.cpp
View file

@ -618,7 +618,7 @@ void SyncEngine::startSync()
// This is used for the DiscoveryJob to be able to request the main thread/
// to read in directory contents.
qDebug() << Q_FUNC_INFO << _remotePath << _remoteUrl;
_discoveryMainThread->setupHooks(_csync_ctx, discoveryJob, _remotePath);
_discoveryMainThread->setupHooks( discoveryJob, _remotePath);
// Starts the update in a seperate thread
QMetaObject::invokeMethod(discoveryJob, "start", Qt::QueuedConnection);